Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r0c2bf438ed50329eb54080105edd26f2f841ca85
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision 0c2bf438ed50329eb54080105edd26f2f841ca85)
@@ -43,10 +43,10 @@
     private Organisation organisation;
 
     /** persistent field */
-    private Set userOrganisationRoles;
+    private Set<UserOrganisationRole> userOrganisationRoles;
 
     /** full constructor */
-    public UserOrganisation(User user, Organisation organisation, Set userOrganisationRoles) {
+    public UserOrganisation(User user, Organisation organisation, Set<UserOrganisationRole> userOrganisationRoles) {
 	this.user = user;
 	this.organisation = organisation;
 	this.userOrganisationRoles = userOrganisationRoles;
@@ -86,17 +86,17 @@
 	this.organisation = organisation;
     }
 
-    public Set getUserOrganisationRoles() {
+    public Set<UserOrganisationRole> getUserOrganisationRoles() {
 	return this.userOrganisationRoles;
     }
 
-    public void setUserOrganisationRoles(Set userOrganisationRoles) {
+    public void setUserOrganisationRoles(Set<UserOrganisationRole> userOrganisationRoles) {
 	this.userOrganisationRoles = userOrganisationRoles;
     }
 
     public void addUserOrganisationRole(UserOrganisationRole userOrganisationRole) {
 	if (userOrganisationRoles == null) {
-	    userOrganisationRoles = new HashSet();
+	    userOrganisationRoles = new HashSet<>();
 	}
 	userOrganisationRoles.add(userOrganisationRole);
     }