Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -rd9b3433f41c2b25011809144d241d33237d9b9d8 -r2e9ee1c2451a05981f05e9edf89bb3356cf2b147
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision d9b3433f41c2b25011809144d241d33237d9b9d8)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -536,7 +536,28 @@
 			</props>
 		</property>
 	</bean>
-
+
+
+	<bean id="qbServiceTarget" class="org.lamsfoundation.lams.qb.service.QbService">
+		<property name="qbDAO"><ref bean="qbDAO"/></property>
+	</bean>
+	
+	<bean id="qbService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="qbServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
 	<!-- Learning Design related beans-->
 	
 	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
@@ -680,6 +701,10 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
+	<bean id="qbDAO" class="org.lamsfoundation.lams.qb.dao.hibernate.QbDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
 	<!--  System Session bean -->
 	<bean id="SystemSession"
 	    class="org.lamsfoundation.lams.web.session.SessionManager"
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -0,0 +1,11 @@
+package org.lamsfoundation.lams.qb.dao;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+
+public interface IQbDAO extends IBaseDAO {
+    // finds next question ID for Question Bank question
+    int getMaxQuestionId();
+
+    // finds next version for given question ID for Question Bank question
+    int getMaxQuestionVersion(Integer qbQuestionId);
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -0,0 +1,25 @@
+package org.lamsfoundation.lams.qb.dao.hibernate;
+
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.qb.dao.IQbDAO;
+
+public class QbDAO extends LAMSBaseDAO implements IQbDAO {
+
+    private static final String FIND_MAX_QUESTION_ID = "SELECT MAX(questionId) FROM QbQuestion";
+    private static final String FIND_MAX_VERSION = "SELECT MAX(version) FROM QbQuestion AS q WHERE q.questionId = :questionId";
+
+    @Override
+    public int getMaxQuestionId() {
+	Object result = this.getSession().createQuery(FIND_MAX_QUESTION_ID).uniqueResult();
+	Integer max = (Integer) result;
+	return max == null ? 1 : max + 1;
+    }
+
+    @Override
+    public int getMaxQuestionVersion(Integer qbQuestionId) {
+	Object result = this.getSession().createQuery(FIND_MAX_VERSION).setParameter("questionId", qbQuestionId)
+		.uniqueResult();
+	Integer max = (Integer) result;
+	return max == null ? 1 : max + 1;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -0,0 +1,9 @@
+package org.lamsfoundation.lams.qb.service;
+
+public interface IQbService {
+    // finds next question ID for Question Bank question
+    int getMaxQuestionId();
+
+    // finds next version for given question ID for Question Bank question
+    int getMaxQuestionVersion(Integer qbQuestionId);
+}
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -0,0 +1,22 @@
+package org.lamsfoundation.lams.qb.service;
+
+import org.lamsfoundation.lams.qb.dao.IQbDAO;
+
+public class QbService implements IQbService {
+
+    private IQbDAO qbDAO;
+
+    @Override
+    public int getMaxQuestionId() {
+	return qbDAO.getMaxQuestionId();
+    }
+
+    @Override
+    public int getMaxQuestionVersion(Integer qbQuestionId) {
+	return qbDAO.getMaxQuestionVersion(qbQuestionId);
+    }
+
+    public void setQbDAO(IQbDAO qbDAO) {
+	this.qbDAO = qbDAO;
+    }
+}
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
diff -u -r4b2b48600119f8594fd3c82b58783c28b63324de -r2e9ee1c2451a05981f05e9edf89bb3356cf2b147
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 4b2b48600119f8594fd3c82b58783c28b63324de)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -92,12 +92,4 @@
     List getAllQuestionEntriesSorted(final long qaContentId);
 
     void releaseQuestionFromCache(McQueContent question);
-
-    // finds next question ID for Question Bank question
-    // it will be moved to a common service in the future
-    public int getMaxQbQuestionId();
-
-    // finds next version for given question ID for Question Bank question
-    // it will be moved to a common service in the future
-    public int getMaxQbQuestionVersion(Integer qbQuestionId);
-}
+}
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r4b2b48600119f8594fd3c82b58783c28b63324de -r2e9ee1c2451a05981f05e9edf89bb3356cf2b147
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 4b2b48600119f8594fd3c82b58783c28b63324de)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -114,20 +114,4 @@
     public void releaseQuestionFromCache(McQueContent question) {
 	getSession().evict(question);
     }
-
-    @Override
-    public int getMaxQbQuestionId() {
-	Object result = this.getSession().createQuery("SELECT MAX(questionId) FROM QbQuestion").uniqueResult();
-	Integer max = (Integer) result;
-	return max == null ? 1 : max + 1;
-    }
-
-    @Override
-    public int getMaxQbQuestionVersion(Integer qbQuestionId) {
-	Object result = this.getSession()
-		.createQuery("SELECT MAX(version) FROM QbQuestion AS q WHERE q.questionId = :questionId")
-		.setParameter("questionId", qbQuestionId).uniqueResult();
-	Integer max = (Integer) result;
-	return max == null ? 1 : max + 1;
-    }
 }
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2e9ee1c2451a05981f05e9edf89bb3356cf2b147
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -88,6 +88,7 @@
 			   		<property name="mcOutputFactory"><ref bean="mcOutputFactory"/></property>	
 			   		<property name="messageService"><ref bean="lamcMessageService"/></property>
 			   		<property name="userManagementService"><ref bean="userManagementService"/></property>
+			   		<property name="qbService"><ref bean="qbService"/></property>
 				</bean>
 			</property>
 			<property name="transactionAttributes">
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -rc87bb47eb670934f10192c08922f83367bc36230 -r2e9ee1c2451a05981f05e9edf89bb3356cf2b147
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision c87bb47eb670934f10192c08922f83367bc36230)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 2e9ee1c2451a05981f05e9edf89bb3356cf2b147)
@@ -62,6 +62,7 @@
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.Tool;
@@ -138,6 +139,7 @@
     private IToolContentHandler mcToolContentHandler = null;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
+    private IQbService qbService;
 
     private MessageService messageService;
 
@@ -288,7 +290,7 @@
 		// if it does not exist, create a new one
 		qbQuestion = new QbQuestion();
 		qbQuestion.setType(QbQuestion.TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER);
-		qbQuestion.setQuestionId(mcQueContentDAO.getMaxQbQuestionId());
+		qbQuestion.setQuestionId(qbService.getMaxQuestionId());
 	    }
 	    // make a clone to check if data changed
 	    QbQuestion qbQuestionClone = qbQuestion.clone();
@@ -327,7 +329,7 @@
 		// if vital data changed, the already modified clone becomes the new question
 		qbQuestion = qbQuestionClone;
 		// create a new question version instead of modifying existing one
-		int newVersion = mcQueContentDAO.getMaxQbQuestionVersion(qbQuestion.getQuestionId());
+		int newVersion = qbService.getMaxQuestionVersion(qbQuestion.getQuestionId());
 		qbQuestion.setVersion(newVersion);
 	    } else {
 		// if no modification was made, prevent clone from being persisted
@@ -1880,6 +1882,10 @@
 	this.messageService = messageService;
     }
 
+    public void setQbService(IQbService qbService) {
+	this.qbService = qbService;
+    }
+
     @Override
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return mcOutputFactory.getSupportedDefinitionClasses(definitionType);