Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 -racf48dfa2651bb60b7ea02898d804d79e444aa73
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision acf48dfa2651bb60b7ea02898d804d79e444aa73)
@@ -40,7 +40,6 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
@@ -52,8 +51,9 @@
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -63,6 +63,8 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rest.RestTags;
+import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.IToolVO;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -75,8 +77,8 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
 import org.lamsfoundation.lams.tool.mc.McApplicationException;
-import org.lamsfoundation.lams.tool.mc.McOptionDTO;
 import org.lamsfoundation.lams.tool.mc.McLearnerAnswersDTO;
+import org.lamsfoundation.lams.tool.mc.McOptionDTO;
 import org.lamsfoundation.lams.tool.mc.McQuestionDTO;
 import org.lamsfoundation.lams.tool.mc.McSessionMarkDTO;
 import org.lamsfoundation.lams.tool.mc.McStringComparator;
@@ -99,6 +101,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
@@ -115,7 +118,7 @@
  * 
  * @author Ozgur Demirtas
  */
-public class McServicePOJO implements IMcService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager,
+public class McServicePOJO implements IMcService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager, ToolRestManager,
 	McAppConstants {
     private static Logger logger = Logger.getLogger(McServicePOJO.class.getName());
 
@@ -2000,4 +2003,66 @@
 	return getMcOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
 
+    // ****************** REST methods *************************
+
+    /** Rest call to create a new Multiple Choice content. Required fields in toolContentJSON: "title", "instructions", "questions".
+     * The questions entry should be JSONArray containing JSON objects, which in turn must contain "questionText", "displayOrder" (Integer) and a JSONArray "answers".
+     * The answers entry should be JSONArray containing JSON objects, which in turn must contain "answerText", "displayOrder" (Integer), "correct" (Boolean).
+     * 
+     * Retries are controlled by lockWhenFinished, which defaults to true (no retries).
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException {
+
+	McContent mcq = new McContent();
+	Date updateDate = new Date();
+
+	mcq.setCreationDate(updateDate);
+	mcq.setUpdateDate(updateDate);
+	mcq.setCreatedBy(userID.longValue());
+	mcq.setDefineLater(false);
+
+	mcq.setMcContentId(toolContentID);
+	mcq.setTitle(toolContentJSON.getString(RestTags.TITLE));
+	mcq.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	
+	mcq.setRetries(JsonUtil.opt(toolContentJSON, "allowRetries", Boolean.FALSE));
+	mcq.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+	mcq.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	mcq.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS,""));
+	mcq.setQuestionsSequenced(JsonUtil.opt(toolContentJSON, "questionsSequenced", Boolean.FALSE));
+	mcq.setRandomize(JsonUtil.opt(toolContentJSON, "randomize", Boolean.FALSE));
+	mcq.setSubmissionDeadline(JsonUtil.opt(toolContentJSON, RestTags.SUBMISSION_DEADLINE, (Date)null));
+	mcq.setShowReport(JsonUtil.opt(toolContentJSON, "showReport", Boolean.FALSE));
+	mcq.setDisplayAnswers(JsonUtil.opt(toolContentJSON, "displayAnswers", Boolean.FALSE));
+	mcq.setShowMarks(JsonUtil.opt(toolContentJSON, "showMarks", Boolean.FALSE));
+	mcq.setPrefixAnswersWithLetters(JsonUtil.opt(toolContentJSON, "prefixAnswersWithLetters", Boolean.TRUE));
+	mcq.setPassMark(JsonUtil.opt(toolContentJSON, "passMark", 0));
+	
+	createMc(mcq);
+	
+	// Questions
+	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
+	for (int i=0; i<questions.length(); i++) {
+	    JSONObject questionData = (JSONObject) questions.get(i);
+	    McQueContent question = new McQueContent(questionData.getString(RestTags.QUESTION_TEXT), questionData.getInt(RestTags.DISPLAY_ORDER), 1, "", 
+		    mcq, null, new HashSet<McOptsContent>());
+
+	    JSONArray optionsData = (JSONArray) questionData.getJSONArray(RestTags.ANSWERS);
+	    for (int j=0; j<optionsData.length(); j++) {
+		JSONObject optionData = (JSONObject) optionsData.get(j);
+		question.getMcOptionsContents().add(new McOptsContent(optionData.getInt(RestTags.DISPLAY_ORDER), 
+			optionData.getBoolean(RestTags.CORRECT), 
+			optionData.getString(RestTags.ANSWER_TEXT), 
+			question));
+	    }
+	    saveOrUpdateMcQueContent(question);
+	}
+
+	// TODO    
+	// mcq.setContent(content) - can't find in database
+	// mcq.setConditions(conditions);
+
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r3cddc05ac67dc21b02e6b60c75306c5b1d00e610 -racf48dfa2651bb60b7ea02898d804d79e444aa73
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 3cddc05ac67dc21b02e6b60c75306c5b1d00e610)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision acf48dfa2651bb60b7ea02898d804d79e444aa73)
@@ -54,6 +54,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.IToolVO;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
@@ -1505,7 +1506,8 @@
     // ****************** REST methods *************************
 
     /** Rest call to create a new Q&A content. Required fields in toolContentJSON: title, instructions, questions.
-     * The questions entry should be JSONArray containing JSON objects, which in turn must contain a question entry and may also contain feedback and required (boolean)
+     * The questions entry should be JSONArray containing JSON objects, which in turn must contain "questionText", "displayOrder"
+     * and may also contain feedback and required (boolean)
      */
     @Override
     public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException {
@@ -1518,41 +1520,41 @@
 	qa.setCreatedBy(userID.longValue());
 
 	qa.setQaContentId(toolContentID);
-	qa.setTitle(toolContentJSON.getString("title"));
-	qa.setInstructions(toolContentJSON.getString("instructions"));
+	qa.setTitle(toolContentJSON.getString(RestTags.TITLE));
+	qa.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
 	
 	qa.setDefineLater(false);
 
-	qa.setLockWhenFinished(JsonUtil.opt(toolContentJSON, "lockOnFinished", Boolean.FALSE));
-	qa.setAllowRichEditor(JsonUtil.opt(toolContentJSON, "allowRichTextEditor", Boolean.FALSE));
-	qa.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
+	qa.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	qa.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	qa.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
 	qa.setShowOtherAnswers(JsonUtil.opt(toolContentJSON, "showOtherAnswers", Boolean.TRUE));
 	qa.setUsernameVisible(JsonUtil.opt(toolContentJSON, "usernameVisible", Boolean.FALSE));
 	qa.setAllowRateAnswers(JsonUtil.opt(toolContentJSON, "allowRateAnswers", Boolean.FALSE));
 	qa.setNotifyTeachersOnResponseSubmit(JsonUtil.opt(toolContentJSON, "notifyTeachersOnResponseSubmit", Boolean.FALSE));
-	qa.setReflect(JsonUtil.opt(toolContentJSON, "reflect", Boolean.FALSE));
-	qa.setReflectionSubject(JsonUtil.opt(toolContentJSON, "reflectionSubject",(String)null));
+	qa.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	qa.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS,(String)null));
 	qa.setQuestionsSequenced(JsonUtil.opt(toolContentJSON, "questionsSequenced", Boolean.FALSE));
 
-	qa.setSubmissionDeadline(JsonUtil.opt(toolContentJSON, "submissionDeadline",(Date)null));
+	qa.setSubmissionDeadline(JsonUtil.opt(toolContentJSON, RestTags.SUBMISSION_DEADLINE,(Date)null));
 
 	// qa.setMonitoringReportTitle(); Can't find this field in the database - assuming unused.
 	// qa.setReportTitle(); Can't find this field in the database - assuming unused.
 	// qa.setContent(content);  Can't find this field in the database - assuming unused.
 
 	saveOrUpdateQaContent(qa);
 	// Questions
-	JSONArray questions = toolContentJSON.getJSONArray("questions");
+	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
 	for (int i=0; i<questions.length(); i++) {
 	    JSONObject questionData = (JSONObject) questions.get(i);
-	    QaQueContent question = new QaQueContent(questionData.getString("question"), i + 1, 
+	    QaQueContent question = new QaQueContent(questionData.getString(RestTags.QUESTION_TEXT), 
+		    questionData.getInt(RestTags.DISPLAY_ORDER), 
 		    JsonUtil.opt(questionData,"feedback",(String)null), 
 		    JsonUtil.opt(questionData, "required", Boolean.FALSE), qa );
 	    saveOrUpdateQuestion(question);
 	}
 
 	// TODO
-//	qa.setQaQueContents(qaQueContents);
 //	qa.setConditions(conditions);
 
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -rabef99c4c0d20eaeeb3dfec9e7df26ab1c206fef -racf48dfa2651bb60b7ea02898d804d79e444aa73
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision abef99c4c0d20eaeeb3dfec9e7df26ab1c206fef)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision acf48dfa2651bb60b7ea02898d804d79e444aa73)
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -672,10 +673,10 @@
 
 	NoticeboardContent noticeboard = new NoticeboardContent();
 	noticeboard.setNbContentId(toolContentID);
-	noticeboard.setTitle(toolContentJSON.getString("title"));
+	noticeboard.setTitle(toolContentJSON.getString(RestTags.TITLE));
 	noticeboard.setContent(toolContentJSON.getString("content"));
-	noticeboard.setReflectOnActivity(JsonUtil.opt(toolContentJSON, "reflectOnActivity", Boolean.FALSE));
-	noticeboard.setReflectInstructions((String)JsonUtil.opt(toolContentJSON, "reflectInstructions", null));
+	noticeboard.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	noticeboard.setReflectInstructions((String)JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
 
 	noticeboard.setCreatorUserId(userID.longValue());
 	noticeboard.setDateCreated(updateDate);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -raebd696e1f508380e9154cf50fb2d61821287b0c -racf48dfa2651bb60b7ea02898d804d79e444aa73
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision aebd696e1f508380e9154cf50fb2d61821287b0c)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision acf48dfa2651bb60b7ea02898d804d79e444aa73)
@@ -43,6 +43,7 @@
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -608,21 +609,23 @@
     
     // ****************** REST methods *************************
 
+    /** Rest call to create a new Notebook content. Required fields in toolContentJSON: "title", "instructions".
+     */
     @Override
     public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException {
 	Date updateDate = new Date();
 
 	Notebook nb = new Notebook();
 	nb.setToolContentId(toolContentID);
-	nb.setTitle(toolContentJSON.getString("title"));
-	nb.setInstructions(toolContentJSON.getString("instructions"));
+	nb.setTitle(toolContentJSON.getString(RestTags.TITLE));
+	nb.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
 	nb.setCreateBy(userID.longValue());
 	nb.setCreateDate(updateDate);
 	nb.setUpdateDate(updateDate);
 
-	nb.setLockOnFinished(JsonUtil.opt(toolContentJSON, "lockOnFinished", Boolean.FALSE));
-	nb.setAllowRichEditor(JsonUtil.opt(toolContentJSON, "allowRichTextEditor", Boolean.FALSE));
-	nb.setSubmissionDeadline((Date)JsonUtil.opt(toolContentJSON, "submissionDeadline", null));
+	nb.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	nb.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	nb.setSubmissionDeadline((Date)JsonUtil.opt(toolContentJSON, RestTags.SUBMISSION_DEADLINE, null));
 
 	nb.setContentInUse(false);
 	nb.setDefineLater(false);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -rc21616f59a9c46798f42cc5e9fc758ed824f701a -racf48dfa2651bb60b7ea02898d804d79e444aa73
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision c21616f59a9c46798f42cc5e9fc758ed824f701a)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision acf48dfa2651bb60b7ea02898d804d79e444aa73)
@@ -45,6 +45,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -625,9 +626,9 @@
     // ****************** REST methods *************************
     
     /** Used by the Rest calls to create content. 
-     * Mandatory fields in toolContentJSON: title, instructions, topics.
-     * Topics must contain a JSONArray of JSONObject objects, which have the following mandatory fields: subject, body
-     * There should be at least one topic object in the Topics array.
+     * Mandatory fields in toolContentJSON: "title", "instructions", "questions".
+     * Questions must contain a JSONArray of JSONObject objects, which have the following mandatory fields: "displayOrder", "questionText"
+     * There should be at least one topic object in the "questions" array.
      */
     @Override
     public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException {
@@ -643,25 +644,26 @@
 	scribe.setContentInUse(false);
 	scribe.setDefineLater(false);
 
-	scribe.setTitle(toolContentJSON.getString("title"));
-	scribe.setInstructions(toolContentJSON.getString("instructions"));
+	scribe.setTitle(toolContentJSON.getString(RestTags.TITLE));
+	scribe.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
 
 	scribe.setAutoSelectScribe(JsonUtil.opt(toolContentJSON, "autoSelectScribe", Boolean.FALSE));
-	scribe.setLockOnFinished(JsonUtil.opt(toolContentJSON, "lockOnFinished", Boolean.FALSE));
-	scribe.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, "reflectInstructions", null));
-	scribe.setReflectOnActivity(JsonUtil.opt(toolContentJSON, "reflectOnActivity", Boolean.FALSE));
+	scribe.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	scribe.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
+	scribe.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	scribe.setShowAggregatedReports(JsonUtil.opt(toolContentJSON, "showAggregatedReports", Boolean.FALSE));
 
 	Set headings = scribe.getScribeHeadings();
 	if ( headings == null ) {
 	    headings = new HashSet();
 	    scribe.setScribeHeadings(headings);
 	}
-	JSONArray headingData = toolContentJSON.getJSONArray("headings");
-	for ( int i=0; i<headingData.length(); i++) {
+	JSONArray topics = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
+	for ( int i=0; i<topics.length(); i++) {
+	    JSONObject topic = topics.getJSONObject(i);
 	    ScribeHeading heading = new ScribeHeading();
-	    heading.setDisplayOrder(i);
-	    heading.setHeadingText(headingData.getString(i));
+	    heading.setDisplayOrder(topic.getInt(RestTags.DISPLAY_ORDER));
+	    heading.setHeadingText(topic.getString(RestTags.QUESTION_TEXT));
 	    heading.setScribe(scribe);
 	    headings.add(heading);
 	}