Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -93,7 +93,7 @@
 		}
 		String username = request.getRemoteUser();
 		OrgListDTO orgManageForm = new OrgListDTO();
-		Organisation org = service.getOrganisationById(orgId);
+		Organisation org = (Organisation)service.findById(Organisation.class,orgId);
 		log.debug("orgId:"+orgId);
 		if(org==null){
 			errors.add("org",new ActionMessage("error.org.invalid"));
@@ -117,7 +117,7 @@
 			}else{
 				type = OrganisationType.CLASS_TYPE;
 			}
-			List organisations = service.getOrganisationsByType(type);
+			List organisations = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",type);
 			log.debug("user is sysadmin");
 			log.debug("Got "+organisations.size()+" organsiations");
 			log.debug("organisationType is "+type);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -101,11 +101,11 @@
 			Integer orgId = (Integer)orgForm.get("orgId");
 			Organisation org;
 			if(orgId!=0){
-				org = service.getOrganisationById(orgId);
+				org = (Organisation)service.findById(Organisation.class,orgId);
 			}else{
 				org = new Organisation();
 				org.setCreateDate(new Date());
-				org.setParentOrganisation(service.getOrganisationById((Integer)orgForm.get("parentId")));
+				org.setParentOrganisation((Organisation)service.findById(Organisation.class,(Integer)orgForm.get("parentId")));
 				org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,(Integer)orgForm.get("typeId")));
 			}
 			BeanUtils.copyProperties(org,orgForm);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -77,7 +77,7 @@
 	public ActionForward edit(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception{
 		Integer orgId = WebUtil.readIntParam(request,"orgId",true);
 		if(orgId != null){//editing existing organisation
-			Organisation org = service.getOrganisationById(orgId);
+			Organisation org = (Organisation)service.findById(Organisation.class,orgId);
 			DynaActionForm orgForm = (DynaActionForm)form;
 			BeanUtils.copyProperties(orgForm,org);
 			log.debug("Struts Pupulated orgId:"+(Integer)orgForm.get("orgId"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -80,7 +80,7 @@
             HttpServletResponse response) throws Exception {
         // retain orgId to return to userlist
 		Integer orgId = WebUtil.readIntParam(request,"orgId");
-		Organisation organisation = service.getOrganisationById(orgId);
+		Organisation organisation = (Organisation)service.findById(Organisation.class,orgId);
 		Integer parentId = organisation.getParentOrganisation().getOrganisationId();
 
 		request.setAttribute("org",orgId);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
diff -u -r40ca9cd6981fa53a10a9cb60820027dbaafaff2b -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 40ca9cd6981fa53a10a9cb60820027dbaafaff2b)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -92,7 +92,7 @@
 		//String username = request.getRemoteUser();
 		
 		// get org name
-		Organisation organisation = service.getOrganisationById(orgId);
+		Organisation organisation = (Organisation)service.findById(Organisation.class,orgId);
 		if(organisation==null) {
 			errors.add("org",new ActionMessage("error.org.invalid"));
 			saveErrors(request,errors);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -40,6 +40,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
+import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
@@ -162,7 +163,7 @@
 				log.debug(user.toString());
 				service.save(user);
 				user = service.getUserByLogin((String)userForm.get("login"));
-				UserOrganisation userOrganisation = new UserOrganisation(user, service.getOrganisationById(orgId));
+				UserOrganisation userOrganisation = new UserOrganisation(user, (Organisation)service.findById(Organisation.class,orgId));
 				service.save(userOrganisation);
 				// set default role to learner
 				Role role = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
===================================================================
diff -u -r47a3094af8f0cd514ca3d06de4084389ea000059 -r2bd7f539aabef95e1a01e41be46e6bb317595287
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(.../DummyMonitoringAction.java)	(revision 47a3094af8f0cd514ca3d06de4084389ea000059)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(.../DummyMonitoringAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
@@ -168,7 +168,7 @@
     		throw new IOException("Learning design id must be set");
     	
     	// hardcode to use the Playpen:Everybody class as the class, Playpen as the course
-        Organisation classOrganisation = usermanageService.getOrganisationById(everybodyClass);
+        Organisation classOrganisation = (Organisation)usermanageService.findById(Organisation.class,everybodyClass);
     	if ( classOrganisation == null )
     		throw new IOException("Organisation cannot be found. Id was "+everybodyClass);