diff --git a/resources/db_update_scripts/current.sql b/resources/db_update_scripts/current.sql
index e69de29bb2..eec111b904 100644
--- a/resources/db_update_scripts/current.sql
+++ b/resources/db_update_scripts/current.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS unit (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `identifier` bigint(20) DEFAULT NULL,
+  `title` varchar(255) NOT NULL,
+  `version` int(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `identifier` (`identifier`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2925 ;
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java
index 5d15ede770..e5077ac80a 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java
@@ -1,15 +1,6 @@
 package se.su.dsv.scipro.data.dataobjects;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import javax.persistence.*;
 
 @Entity
 @DiscriminatorColumn(name = "rolename", discriminatorType = DiscriminatorType.STRING, length = 8)
@@ -26,6 +17,9 @@ public abstract class Role extends LazyDeletableDomainObject implements Comparab
 	@ManyToOne(optional=false)
 	protected User user;
 
+    @OneToOne(optional=true)
+    private Unit unit;
+
 	/**
 	 * @param id the id to set
 	 */
@@ -128,4 +122,11 @@ public abstract class Role extends LazyDeletableDomainObject implements Comparab
 		return comp;		
 	}
 
+    public Unit getUnit() {
+        return unit;
+    }
+
+    public void setUnit(Unit unit) {
+        this.unit = unit;
+    }
 }