diff --git a/README_ASSIGNMENT.pdf b/README_ASSIGNMENT.pdf
new file mode 100644
index 000000000..cf841c323
Binary files /dev/null and b/README_ASSIGNMENT.pdf differ
diff --git a/alitheia/core/src/main/java/eu/sqooss/service/db/Developer.java b/alitheia/core/src/main/java/eu/sqooss/service/db/Developer.java
index 26f99af02..e07581972 100644
--- a/alitheia/core/src/main/java/eu/sqooss/service/db/Developer.java
+++ b/alitheia/core/src/main/java/eu/sqooss/service/db/Developer.java
@@ -33,11 +33,8 @@
 
 package eu.sqooss.service.db;
 
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
-import java.util.Map;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -53,9 +50,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.codec.digest.DigestUtils;
-
-import eu.sqooss.core.AlitheiaCore;
 import eu.sqooss.service.db.DAObject;
 
 /**
@@ -198,239 +192,6 @@ public void addAlias(String email) {
             getAliases().add(da);
     }
     
-    /**
-     * Return the entry in the Developer table that corresponds to the provided
-     * email. If the entry does not exist, it will be created and saved. If the
-     * email username (the part before @) exists in the database, then this
-     * record is updated with the provided email and returned.
-     * 
-     * @param email
-     *            The Developer's email
-     * @param sp The StoredProject this Developer belongs to
-     * @return A Developer record for the specified Developer or null when:
-     *         <ul>
-     *         <li>The passed StoredProject does not exist</li>
-     *         <li>The passed email is invalid syntactically</li>
-     *         <ul>
-     */
-    public static Developer getDeveloperByEmail(String email, 
-            StoredProject sp) {
-        return getDeveloperByEmail(email, sp, true);
-    }
-    
-    /**
-     * Return the entry in the Developer table that corresponds to the provided
-     * email. If the entry does not exist, then the parameter <tt>create</tt>
-     * controls whether it will be created and saved. If the email username (the
-     * part before @) exists in the database, then this record is updated with
-     * the provided email and returned.
-     * 
-     * @param email The Developer's email
-     * @param sp The StoredProject this Developer belongs to
-     * @return A Developer record for the specified Developer or null when:
-     *         <ul>
-     *         <li>The passed StoredProject does not exist</li>
-     *         <li>The passed email is invalid syntactically</li>
-     *         <ul>
-     */
-    public static synchronized Developer getDeveloperByEmail(String email,
-            StoredProject sp, boolean create){
-        DBService dbs = AlitheiaCore.getInstance().getDBService();
-        
-        String paramProject = "project";
-        String paramEmail = "email";
-
-        StringBuffer q = new StringBuffer("select d ");
-        q.append(" from Developer d, DeveloperAlias da ");
-        q.append(" where da.developer = d ");
-        q.append(" and d.storedProject = :").append(paramProject);
-        q.append(" and da.email = :").append(paramEmail);
-        
-        Map<String,Object> parameterMap = new HashMap<String,Object>();
-        parameterMap.put(paramEmail, email);
-        parameterMap.put(paramProject, sp);
-        
-        List<Developer> devs = (List<Developer>) dbs.doHQL(q.toString(), parameterMap);
-        
-        /* Developer in the DB, return it */
-        if ( !devs.isEmpty() )
-            return devs.get(0);
-        
-        parameterMap.clear();
-        
-      /*  if (!email.contains("@"))
-            return null;
-        
-        String unameFromEmail = email.substring(0, email.indexOf('@'));
-        
-        if (unameFromEmail == "" || unameFromEmail == email)
-            return null;
-        
-        parameterMap.put("username", unameFromEmail);
-        parameterMap.put("storedProject", sp);
-        
-        devs = dbs.findObjectsByProperties(Developer.class, 
-                parameterMap);
-        
-        /* Developer's uname in table, update with email and return it *
-        if (!devs.isEmpty()) {
-            Developer d = devs.get(0);
-            d.addAlias(email);
-            return d;
-        }*/
-        
-        /* Try Ohloh */
-        String hash = DigestUtils.shaHex(email);
-        OhlohDeveloper od = OhlohDeveloper.getByEmailHash(hash);
-        
-        if (od != null) {
-            Developer d = getDeveloperByUsername(od.getUname(), sp, false);
-        
-            if (d != null) {
-                d.addAlias(email);
-                return d;
-            }
-        }
-        
-        if (!create)
-            return null;
-        
-        /* Developer email not in table, create it new developer*/ 
-        Developer d = new Developer();
-        d.setStoredProject(sp);
-        
-        /*Failure here probably indicates non-existing StoredProject*/
-        if ( !dbs.addRecord(d) )
-            return null;
-        
-        d.addAlias(email);
-        
-        return d;
-    }
-    
-    /**
-     * Return the entry in the Developer table that corresponds to the provided
-     * username. If the entry does not exist, it will be created and saved. If
-     * the username matches the email of an existing developer in the database,
-     * then this record is updated with the provided username and returned.
-     * 
-     * @param username The Developer's username
-     * @param sp The StoredProject this Developer belongs to
-     * @return A Developer record for the specified Developer or null on failure
-     */
-    public static Developer getDeveloperByUsername(String username, 
-            StoredProject sp) {
-        return getDeveloperByUsername(username, sp, true);
-    }
-    
-    /**
-     * Return the entry in the Developer table that corresponds to the provided
-     * username. If the entry does not exist, then the parameter <tt>create</tt>
-     * controls whether it will be created and saved. If the username matches
-     * the email of an existing developer in the database, then this record is
-     * updated with the provided username and returned.
-     * 
-     * @param username The Developer's username
-     * @param sp The StoredProject this Developer belongs to
-     * @param create Create the developer entry if not found?
-     * 
-     * @return A Developer record for the specified Developer or null on failure
-     *         to retrieve or create an entry.
-     * 
-     */    
-    @SuppressWarnings("unchecked")
-    public static synchronized Developer getDeveloperByUsername(String username,
-            StoredProject sp, boolean create) {
-		
-        DBService dbs = AlitheiaCore.getInstance().getDBService();
-
-        Map<String, Object> parameterMap = new HashMap<String, Object>();
-        parameterMap.put("username", username);
-        parameterMap.put("storedProject", sp);
-
-        List<Developer> devs = dbs.findObjectsByProperties(Developer.class,
-                                                           parameterMap);
-
-        /*
-         * Developer in the DB, return it Username + storedproject is unique, so
-         * only one record can be returned by the query
-         */
-        if (!devs.isEmpty())
-            return devs.get(0);
-        
-        /*
-         * Try to find a Developer whose email starts with username
-         * 
-         * TODO: "like" is NOT a Hibernate keyword. The following query might
-         * only work with certain databases (tested with mysql, postgres and 
-         * derby).
-         */
-        /*devs = (List<Developer>) dbs.doHQL("from Developer as foo where email like " +
-        		"'%" +username+ "%' and storedProject.id=" + sp.getId() );
-
-        for (Developer d : devs) {
-            Set<DeveloperAlias> aliases = d.getAliases();
-            for (DeveloperAlias da : aliases) {
-                /* Ok got one, update the username *
-                if (da.getEmail().startsWith(username)) {
-                    d.setUsername(username);
-                    return d;
-                }
-            }
-        }*/
-       
-        if (!create)
-            return null;
-        
-        /* Developer not in table, create new developer */
-        Developer d = new Developer();
-
-        d.setUsername(username);
-        d.setStoredProject(sp);
-
-        /*Failure here probably indicates non-existing StoredProject*/
-        if (!dbs.addRecord(d))
-            return null;
-
-        return d;
-    }   
-    
-    /**
-     * Get a developer entry by developer name. If the entry does not exist,
-     * then the parameter <tt>create</tt> controls whether it will be created
-     * and saved.
-     * 
-     * @param name
-     * @param sp
-     * @param create
-     * @return
-     */
-    public static synchronized Developer getDeveloperByName(String name, 
-            StoredProject sp, boolean create) {
-        
-        DBService dbs = AlitheiaCore.getInstance().getDBService();
-
-        Map<String, Object> params = new HashMap<String, Object>();
-        params.put("name", name);
-        params.put("storedProject", sp);
-
-        List<Developer> devs = dbs.findObjectsByProperties(Developer.class,params);
-        
-        /* This code assumes that each name is unique in a project*/
-        if (devs.size() > 0)
-            return devs.get(0);
-        
-        if (!create)        
-            return null;
-        
-        Developer d = new Developer();
-        d.setName(name);
-        if (!dbs.addRecord(d))
-            return null;
-        
-        return d;
-    }
-    
     public String toString() {
         StringBuffer dev =  new StringBuffer(); 
         dev.append(name).append(", aka:").append(username).append(" (");
diff --git a/alitheia/core/src/main/java/eu/sqooss/service/db/DeveloperDB.java b/alitheia/core/src/main/java/eu/sqooss/service/db/DeveloperDB.java
new file mode 100644
index 000000000..ef61e2550
--- /dev/null
+++ b/alitheia/core/src/main/java/eu/sqooss/service/db/DeveloperDB.java
@@ -0,0 +1,246 @@
+package eu.sqooss.service.db;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+import eu.sqooss.core.AlitheiaCore;
+
+public class DeveloperDB {
+
+	/**
+	 * Return the entry in the Developer table that corresponds to the provided
+	 * email. If the entry does not exist, it will be created and saved. If the
+	 * email username (the part before @) exists in the database, then this
+	 * record is updated with the provided email and returned.
+	 * 
+	 * @param email
+	 *            The Developer's email
+	 * @param sp The StoredProject this Developer belongs to
+	 * @return A Developer record for the specified Developer or null when:
+	 *         <ul>
+	 *         <li>The passed StoredProject does not exist</li>
+	 *         <li>The passed email is invalid syntactically</li>
+	 *         <ul>
+	 */
+	public static Developer getDeveloperByEmail(String email, 
+	        StoredProject sp) {
+	    return DeveloperDB.getDeveloperByEmail(email, sp, true);
+	}
+
+	/**
+	 * Return the entry in the Developer table that corresponds to the provided
+	 * email. If the entry does not exist, then the parameter <tt>create</tt>
+	 * controls whether it will be created and saved. If the email username (the
+	 * part before @) exists in the database, then this record is updated with
+	 * the provided email and returned.
+	 * 
+	 * @param email The Developer's email
+	 * @param sp The StoredProject this Developer belongs to
+	 * @return A Developer record for the specified Developer or null when:
+	 *         <ul>
+	 *         <li>The passed StoredProject does not exist</li>
+	 *         <li>The passed email is invalid syntactically</li>
+	 *         <ul>
+	 */
+	public static synchronized Developer getDeveloperByEmail(String email,
+	        StoredProject sp, boolean create){
+	    DBService dbs = AlitheiaCore.getInstance().getDBService();
+	    
+	    String paramProject = "project";
+	    String paramEmail = "email";
+	
+	    StringBuffer q = new StringBuffer("select d ");
+	    q.append(" from Developer d, DeveloperAlias da ");
+	    q.append(" where da.developer = d ");
+	    q.append(" and d.storedProject = :").append(paramProject);
+	    q.append(" and da.email = :").append(paramEmail);
+	    
+	    Map<String,Object> parameterMap = new HashMap<String,Object>();
+	    parameterMap.put(paramEmail, email);
+	    parameterMap.put(paramProject, sp);
+	    
+	    List<Developer> devs = (List<Developer>) dbs.doHQL(q.toString(), parameterMap);
+	    
+	    /* Developer in the DB, return it */
+	    if ( !devs.isEmpty() )
+	        return devs.get(0);
+	    
+	    parameterMap.clear();
+	    
+	  /*  if (!email.contains("@"))
+	        return null;
+	    
+	    String unameFromEmail = email.substring(0, email.indexOf('@'));
+	    
+	    if (unameFromEmail == "" || unameFromEmail == email)
+	        return null;
+	    
+	    parameterMap.put("username", unameFromEmail);
+	    parameterMap.put("storedProject", sp);
+	    
+	    devs = dbs.findObjectsByProperties(Developer.class, 
+	            parameterMap);
+	    
+	    /* Developer's uname in table, update with email and return it *
+	    if (!devs.isEmpty()) {
+	        Developer d = devs.get(0);
+	        d.addAlias(email);
+	        return d;
+	    }*/
+	    
+	    /* Try Ohloh */
+	    String hash = DigestUtils.shaHex(email);
+	    OhlohDeveloper od = OhlohDeveloper.getByEmailHash(hash);
+	    
+	    if (od != null) {
+	        Developer d = DeveloperDB.getDeveloperByUsername(od.getUname(), sp, false);
+	    
+	        if (d != null) {
+	            d.addAlias(email);
+	            return d;
+	        }
+	    }
+	    
+	    if (!create)
+	        return null;
+	    
+	    /* Developer email not in table, create it new developer*/ 
+	    Developer d = new Developer();
+	    d.setStoredProject(sp);
+	    
+	    /*Failure here probably indicates non-existing StoredProject*/
+	    if ( !dbs.addRecord(d) )
+	        return null;
+	    
+	    d.addAlias(email);
+	    
+	    return d;
+	}
+
+	/**
+	 * Return the entry in the Developer table that corresponds to the provided
+	 * username. If the entry does not exist, it will be created and saved. If
+	 * the username matches the email of an existing developer in the database,
+	 * then this record is updated with the provided username and returned.
+	 * 
+	 * @param username The Developer's username
+	 * @param sp The StoredProject this Developer belongs to
+	 * @return A Developer record for the specified Developer or null on failure
+	 */
+	public static Developer getDeveloperByUsername(String username, 
+	        StoredProject sp) {
+	    return DeveloperDB.getDeveloperByUsername(username, sp, true);
+	}
+
+	/**
+	 * Return the entry in the Developer table that corresponds to the provided
+	 * username. If the entry does not exist, then the parameter <tt>create</tt>
+	 * controls whether it will be created and saved. If the username matches
+	 * the email of an existing developer in the database, then this record is
+	 * updated with the provided username and returned.
+	 * 
+	 * @param username The Developer's username
+	 * @param sp The StoredProject this Developer belongs to
+	 * @param create Create the developer entry if not found?
+	 * 
+	 * @return A Developer record for the specified Developer or null on failure
+	 *         to retrieve or create an entry.
+	 * 
+	 */    
+	@SuppressWarnings("unchecked")
+	public static synchronized Developer getDeveloperByUsername(String username,
+	        StoredProject sp, boolean create) {
+		
+	    DBService dbs = AlitheiaCore.getInstance().getDBService();
+	
+	    Map<String, Object> parameterMap = new HashMap<String, Object>();
+	    parameterMap.put("username", username);
+	    parameterMap.put("storedProject", sp);
+	
+	    List<Developer> devs = dbs.findObjectsByProperties(Developer.class,
+	                                                       parameterMap);
+	
+	    /*
+	     * Developer in the DB, return it Username + storedproject is unique, so
+	     * only one record can be returned by the query
+	     */
+	    if (!devs.isEmpty())
+	        return devs.get(0);
+	    
+	    /*
+	     * Try to find a Developer whose email starts with username
+	     * 
+	     * TODO: "like" is NOT a Hibernate keyword. The following query might
+	     * only work with certain databases (tested with mysql, postgres and 
+	     * derby).
+	     */
+	    /*devs = (List<Developer>) dbs.doHQL("from Developer as foo where email like " +
+	    		"'%" +username+ "%' and storedProject.id=" + sp.getId() );
+	
+	    for (Developer d : devs) {
+	        Set<DeveloperAlias> aliases = d.getAliases();
+	        for (DeveloperAlias da : aliases) {
+	            /* Ok got one, update the username *
+	            if (da.getEmail().startsWith(username)) {
+	                d.setUsername(username);
+	                return d;
+	            }
+	        }
+	    }*/
+	
+	    if (!create)
+	        return null;
+	    
+	    /* Developer not in table, create new developer */
+	    Developer d = new Developer();
+	
+	    d.setUsername(username);
+	    d.setStoredProject(sp);
+	
+	    /*Failure here probably indicates non-existing StoredProject*/
+	    if (!dbs.addRecord(d))
+	        return null;
+	
+	    return d;
+	}
+
+	/**
+	 * Get a developer entry by developer name. If the entry does not exist,
+	 * then the parameter <tt>create</tt> controls whether it will be created
+	 * and saved.
+	 * 
+	 * @param name
+	 * @param sp
+	 * @param create
+	 * @return
+	 */
+	public static synchronized Developer getDeveloperByName(String name, 
+	        StoredProject sp, boolean create) {
+	    
+	    DBService dbs = AlitheiaCore.getInstance().getDBService();
+	
+	    Map<String, Object> params = new HashMap<String, Object>();
+	    params.put("name", name);
+	    params.put("storedProject", sp);
+	
+	    List<Developer> devs = dbs.findObjectsByProperties(Developer.class,params);
+	    
+	    /* This code assumes that each name is unique in a project*/
+	    if (devs.size() > 0)
+	        return devs.get(0);
+	    
+	    if (!create)        
+	        return null;
+	    
+	    Developer d = new Developer();
+	    d.setName(name);
+	    if (!dbs.addRecord(d))
+	        return null;
+	    
+	    return d;
+	}
+
+}
diff --git a/alitheia/core/src/main/java/eu/sqooss/service/db/MailMessage.java b/alitheia/core/src/main/java/eu/sqooss/service/db/MailMessage.java
index dfffa7edc..fce98dabd 100644
--- a/alitheia/core/src/main/java/eu/sqooss/service/db/MailMessage.java
+++ b/alitheia/core/src/main/java/eu/sqooss/service/db/MailMessage.java
@@ -75,12 +75,12 @@ public class MailMessage extends DAObject {
 	@JoinColumn(name="SENDER_ID")
     private Developer sender;
 
-    /**
-     * The list to which the email was originally sent
-     */
-	@ManyToOne(fetch=FetchType.LAZY)
-	@JoinColumn(name="MLIST_ID")
-    private MailingList list;
+//    /**
+//     * The list to which the email was originally sent
+//     */
+//	@ManyToOne(fetch=FetchType.LAZY)
+//	@JoinColumn(name="MLIST_ID")
+//    private MailingList list;
 
     /**
      * Unique ID for this message in the database
@@ -172,11 +172,13 @@ public void setSender( Developer value ) {
     }
 
     public MailingList getList() {
-        return list;
+    	return this.getThread().getList();
+        //return list;
     }
 
     public void setList( MailingList value ) {
-        list = value;
+    	this.getThread().setList(value);
+        //list = value;
     }
 
     public String getMessageId() {
diff --git a/alitheia/core/src/main/java/eu/sqooss/service/db/MailingList.java b/alitheia/core/src/main/java/eu/sqooss/service/db/MailingList.java
index 1b92720cc..adf9cd40a 100644
--- a/alitheia/core/src/main/java/eu/sqooss/service/db/MailingList.java
+++ b/alitheia/core/src/main/java/eu/sqooss/service/db/MailingList.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -84,11 +85,11 @@ public class MailingList extends DAObject {
 	@JoinColumn(name="PROJECT_ID")
     private StoredProject storedProject;
 
-    /**
-     * The set of available messages in this list
-     */
-	@OneToMany(mappedBy="list", orphanRemoval=true, cascade = CascadeType.ALL)
-    private Set<MailMessage> messages;
+//    /**
+//     * The set of available messages in this list
+//     */
+//	@OneToMany(mappedBy="list", orphanRemoval=true, cascade = CascadeType.ALL)
+//    private Set<MailMessage> messages;
 
     /**
      * The set of threaded discussions in this list
@@ -123,12 +124,16 @@ public void setStoredProject(StoredProject sp) {
     }
 
     public Set<MailMessage> getMessages() {
-        return messages;
+    	Set<MailMessage> listMessages = new TreeSet<MailMessage>();
+        for (MailingListThread thread: this.getThreads()){
+        	listMessages.addAll(thread.getMessages());
+        }
+    	return listMessages;
     }
 
-    public void setMessages(Set<MailMessage> messages) {
-        this.messages = messages;
-    }
+//    public void setMessages(Set<MailMessage> messages) {
+//        this.messages = messages;
+//    }
     
     public Set<MailingListThread> getThreads() {
         return threads;
@@ -151,11 +156,18 @@ public List<MailMessage> getMessagesNewerThan(Date d) {
         String paramDate = "paramDate";
         String paramMailingList = "paramML";
         
-        String query =  " select mm " +
-            " from MailMessage mm, MailingList ml " +
-            " where mm.list = ml " +
-            " and mm.list = :" + paramMailingList +
-            " and mm.sendDate > :" + paramDate;
+        String query = "select mm" +
+        		" from MailingList ml, MailingListThread mlt, MailMessage mm " +
+        		" where ml = mlt.list" +
+        		" and mlt = mm.thread" +
+        		" and mlt.list = :" + paramMailingList +
+        		" and mm.sendDate > :" + paramDate;
+//        
+//        String query =  " select mm " +
+//            " from MailMessage mm, MailingList ml " +
+//            " where mm.list = ml " +
+//            " and mm.list = :" + paramMailingList +
+//            " and mm.sendDate > :" + paramDate;
         
         Map<String,Object> params = new HashMap<String, Object>();
         params.put(paramDate, d);
@@ -177,12 +189,19 @@ public MailMessage getLatestEmail() {
 
         String paramMailingList = "paramML";
         
-        String query =  " select mm " +
-            " from MailMessage mm, MailingList ml " +
-            " where mm.list = ml " +
-            " and mm.list = :" + paramMailingList +
-            " order by mm.sendDate desc";
+        String query = "select mm" +
+        		" from MailingList ml, MailingListThread mlt, MailMessage mm " +
+        		" where ml = mlt.list" +
+        		" and mlt = mm.thread" +
+        		" and mlt.list = :" + paramMailingList +
+        		" order by mm.sendDate desc";
         
+//        String query =  " select mm " +
+//            " from MailMessage mm, MailingList ml " +
+//            " where mm.list = ml " +
+//            " and mm.list = :" + paramMailingList +
+//            " order by mm.sendDate desc";
+//        
         Map<String,Object> params = new HashMap<String, Object>();
         params.put(paramMailingList, this);
         
@@ -206,7 +225,7 @@ public MailingListThread getLatestThread() {
         String query =  " select mt " +
             " from MailThread mt, MailingList ml " +
             " where mt.list = ml " +
-            " and mm.list = :" + paramMailingList +
+            " and mt.list = :" + paramMailingList +
             " order by mt.lastUpdated desc";
         
         Map<String,Object> params = new HashMap<String, Object>();
diff --git a/alitheia/core/src/main/java/sqooss-core.png b/alitheia/core/src/main/java/sqooss-core.png
new file mode 100644
index 000000000..ec55bd14c
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-core.png differ
diff --git a/alitheia/core/src/main/java/sqooss-core.ucls b/alitheia/core/src/main/java/sqooss-core.ucls
new file mode 100644
index 000000000..ce3a02f85
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-core.ucls
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.core.AlitheiaCore" project="core" 
+    file="/core/src/main/java/eu/sqooss/core/AlitheiaCore.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="95" x="57" y="71"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="2" language="java" name="eu.sqooss.core.AlitheiaCoreService" project="core" 
+    file="/core/src/main/java/eu/sqooss/core/AlitheiaCoreService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="285" y="154"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="3" language="java" name="eu.sqooss.core.CoreActivator" project="core" 
+    file="/core/src/main/java/eu/sqooss/core/CoreActivator.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="106" y="202"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <association id="4">    
+    <end type="SOURCE" refId="1" navigable="false">      
+      <attribute id="5" name="instance"/>      
+      <multiplicity id="6" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="7">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="8" name="core"/>      
+      <multiplicity id="9" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-rest-api.png b/alitheia/core/src/main/java/sqooss-rest-api.png
new file mode 100644
index 000000000..1b4aa198c
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-rest-api.png differ
diff --git a/alitheia/core/src/main/java/sqooss-rest-api.ucls b/alitheia/core/src/main/java/sqooss-rest-api.ucls
new file mode 100644
index 000000000..afd1578bb
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-rest-api.ucls
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.rest.api.MetricsResource" project="core" 
+    file="/core/src/main/java/eu/sqooss/rest/api/MetricsResource.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="123" x="95" y="71"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.rest.api.StoredProjectResource" project="core" 
+    file="/core/src/main/java/eu/sqooss/rest/api/StoredProjectResource.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="157" y="191"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-admin.png b/alitheia/core/src/main/java/sqooss-service-admin.png
new file mode 100644
index 000000000..b92173d18
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-admin.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-admin.ucls b/alitheia/core/src/main/java/sqooss-service-admin.ucls
new file mode 100644
index 000000000..0f1a0d2df
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-admin.ucls
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <enumeration id="1" language="java" name="eu.sqooss.service.admin.AdminAction.AdminActionStatus" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/AdminAction.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="306" y="266"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="2" language="java" name="eu.sqooss.service.admin.AdminActionBase" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/AdminActionBase.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="480" y="182"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.service.admin.actions.AddProject" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/actions/AddProject.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="367" y="349"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.service.admin.actions.RunTimeInfo" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/actions/RunTimeInfo.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="541" y="347"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="eu.sqooss.service.admin.actions.UpdateProject" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/actions/UpdateProject.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="704" y="347"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="6" language="java" name="eu.sqooss.service.admin.AdminAction" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/AdminAction.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="303" y="167"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="7" language="java" name="eu.sqooss.service.admin.AdminService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/admin/AdminService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="100" y="156"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="8" language="java" name="eu.sqooss.impl.service.admin.AdminServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/admin/AdminServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="103" y="66"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" name="eu.sqooss.impl.service.admin.AdminServiceImpl.ActionContainer" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/admin/AdminServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="301" y="67"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <association id="10">    
+    <end type="SOURCE" refId="8" navigable="false">      
+      <attribute id="11" name="liveactions"/>      
+      <multiplicity id="12" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="13">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="14" name="aa"/>      
+      <multiplicity id="15" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="16">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="2"/>  
+  </generalization>  
+  <generalization id="17">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="2"/>  
+  </generalization>  
+  <realization id="18">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="7"/>  
+  </realization>  
+  <generalization id="19">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="2"/>  
+  </generalization>  
+  <association id="20">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="21" name="status"/>      
+      <multiplicity id="22" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="23">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="6"/>  
+  </realization>  
+  <nesting id="24">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="9"/>  
+  </nesting>  
+  <nesting id="25">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="1"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-cluster.png b/alitheia/core/src/main/java/sqooss-service-cluster.png
new file mode 100644
index 000000000..0f815c45c
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-cluster.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-cluster.ucls b/alitheia/core/src/main/java/sqooss-service-cluster.ucls
new file mode 100644
index 000000000..5fdf843c0
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-cluster.ucls
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.service.cluster.ClusterNodeActionException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/cluster/ClusterNodeActionException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="445" y="180"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.cluster.ClusterNodeServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/cluster/ClusterNodeServiceImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="137" y="201"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="3" language="java" name="eu.sqooss.service.cluster.ClusterNodeService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/cluster/ClusterNodeService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="137" y="304"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <enumeration id="4" language="java" name="eu.sqooss.service.cluster.ClusterNodeService.ClusterNodeAction" 
+    project="core" file="/core/src/main/java/eu/sqooss/service/cluster/ClusterNodeService.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="311" y="305"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <nesting id="5">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <realization id="6">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="3"/>  
+  </realization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-db.png b/alitheia/core/src/main/java/sqooss-service-db.png
new file mode 100644
index 000000000..03dbdc7e6
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-db.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-db.ucls b/alitheia/core/src/main/java/sqooss-service-db.ucls
new file mode 100644
index 000000000..1f5c020b1
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-db.ucls
@@ -0,0 +1,1546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.service.db.Branch" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Branch.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="598" y="-27"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.service.db.Bug" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Bug.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="193" y="111"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.service.db.BugPriority" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugPriority.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="56" y="196"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="4" language="java" name="eu.sqooss.service.db.BugPriority.Priority" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugPriority.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="54" y="282"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="5" language="java" name="eu.sqooss.service.db.BugReportMessage" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugReportMessage.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-15" y="109"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="eu.sqooss.service.db.BugResolution" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugResolution.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="442" y="209"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="7" language="java" name="eu.sqooss.service.db.BugResolution.Resolution" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugResolution.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="440" y="293"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="8" language="java" name="eu.sqooss.service.db.BugSeverity" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugSeverity.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="279" y="207"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="9" language="java" name="eu.sqooss.service.db.BugSeverity.Severity" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugSeverity.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="275" y="302"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="10" language="java" name="eu.sqooss.service.db.BugStatus" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugStatus.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="194" y="6"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="11" language="java" name="eu.sqooss.service.db.BugStatus.Status" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/BugStatus.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="192" y="-69"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="12" language="java" name="eu.sqooss.service.db.ClusterNode" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ClusterNode.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="737" y="10"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="13" language="java" name="eu.sqooss.service.db.ConfigOption" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ConfigOption.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="372" y="-151"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="14" language="java" name="eu.sqooss.service.db.ConfigurationOption" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ConfigurationOption.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="376" y="-92"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="15" language="java" name="eu.sqooss.service.db.DAObject" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/DAObject.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="385" y="59"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="16" language="java" name="eu.sqooss.service.db.DBService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/DBService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="731" y="-77"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="17" language="java" name="eu.sqooss.service.db.Developer" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Developer.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-9" y="-18"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="18" language="java" name="eu.sqooss.service.db.DeveloperAlias" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/DeveloperAlias.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-10" y="-126"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="19" language="java" name="eu.sqooss.service.db.Directory" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Directory.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="509" y="-97"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="20" language="java" name="eu.sqooss.service.db.EncapsulationUnit" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/EncapsulationUnit.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="337" y="702"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="21" language="java" name="eu.sqooss.service.db.EncapsulationUnitMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/EncapsulationUnitMeasurement.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="288" y="595"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="22" language="java" name="eu.sqooss.service.db.ExecutionUnit" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ExecutionUnit.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="693" y="673"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="23" language="java" name="eu.sqooss.service.db.ExecutionUnitMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ExecutionUnitMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="504" y="773"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="24" language="java" name="eu.sqooss.impl.service.db.DBServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/db/DBServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="724" y="-174"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="25" language="java" name="eu.sqooss.service.db.Language" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Language.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="830" y="709"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="26" language="java" name="eu.sqooss.service.db.MailingList" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MailingList.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="785" y="150"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="27" language="java" name="eu.sqooss.service.db.MailingListThread" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MailingListThread.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="780" y="261"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="28" language="java" name="eu.sqooss.service.db.MailingListThreadMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MailingListThreadMeasurement.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="783" y="357"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="29" language="java" name="eu.sqooss.service.db.MailMessage" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MailMessage.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="220" y="387"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="30" language="java" name="eu.sqooss.service.db.MailMessageMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MailMessageMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="223" y="483"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="31" language="java" name="eu.sqooss.service.db.Metric" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Metric.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="472" y="485"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="32" language="java" name="eu.sqooss.service.db.MetricMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MetricMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="552" y="587"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="33" language="java" name="eu.sqooss.service.db.MetricType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/MetricType.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="418" y="390"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="34" language="java" name="eu.sqooss.service.db.NameSpace" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/NameSpace.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="724" y="577"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="35" language="java" name="eu.sqooss.service.db.NameSpaceMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/NameSpaceMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="888" y="434"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="36" language="java" name="eu.sqooss.service.db.OhlohDeveloper" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/OhlohDeveloper.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="755" y="69"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="37" language="java" name="eu.sqooss.service.db.Plugin" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Plugin.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="893" y="518"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="38" language="java" name="eu.sqooss.service.db.PluginConfiguration" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/PluginConfiguration.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="901" y="629"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="39" language="java" name="eu.sqooss.service.db.ProjectDirectory" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectDirectory.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="507" y="-172"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="40" language="java" name="eu.sqooss.service.db.ProjectFile" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectFile.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="918" y="31"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="41" language="java" name="eu.sqooss.service.db.ProjectFileMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectFileMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="936" y="231"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="42" language="java" name="eu.sqooss.service.db.ProjectFileState" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectFileState.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="917" y="-76"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="43" language="java" name="eu.sqooss.service.db.ProjectVersion" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectVersion.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="578" y="144"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="44" language="java" name="eu.sqooss.service.db.ProjectVersionMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectVersionMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="589" y="260"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="45" language="java" name="eu.sqooss.service.db.ProjectVersionParent" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectVersionParent.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="589" y="62"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="46" language="java" name="eu.sqooss.service.db.ProjectVersionParentId" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/ProjectVersionParentId.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="448" y="-9"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="47" language="java" name="eu.sqooss.service.db.StoredProject" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/StoredProject.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="953" y="124"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="48" language="java" name="eu.sqooss.service.db.StoredProjectConfig" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/StoredProjectConfig.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1113" y="120"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="49" language="java" name="eu.sqooss.service.db.StoredProjectMeasurement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/StoredProjectMeasurement.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1124" y="234"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="50" language="java" name="eu.sqooss.service.db.Tag" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/db/Tag.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="213" y="-148"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <generalization id="51">    
+    <end type="SOURCE" refId="22"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <generalization id="52">    
+    <end type="SOURCE" refId="32"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="53">    
+    <end type="SOURCE" refId="34" navigable="false">      
+      <attribute id="54" name="executionUnits"/>      
+      <multiplicity id="55" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="22" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="56">    
+    <end type="SOURCE" refId="45"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="57">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="58" name="outgoingBranches"/>      
+      <multiplicity id="59" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="60">    
+    <end type="SOURCE" refId="45" navigable="false">      
+      <attribute id="61" name="child"/>      
+      <multiplicity id="62" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="63">    
+    <end type="SOURCE" refId="23"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="64">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="65" name="committer"/>      
+      <multiplicity id="66" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="67">    
+    <end type="SOURCE" refId="35"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="68">    
+    <end type="SOURCE" refId="28" navigable="false">      
+      <attribute id="69" name="metric"/>      
+      <multiplicity id="70" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="71">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="72">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="73" name="measurements"/>      
+      <multiplicity id="74" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="44" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="75">    
+    <end type="SOURCE" refId="23" navigable="false">      
+      <attribute id="76" name="executionUnit"/>      
+      <multiplicity id="77" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="22" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="78">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="79" name="commits"/>      
+      <multiplicity id="80" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="81">    
+    <end type="SOURCE" refId="38" navigable="false">      
+      <attribute id="82" name="plugin"/>      
+      <multiplicity id="83" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="37" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="84">    
+    <end type="SOURCE" refId="44"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="85">    
+    <end type="SOURCE" refId="48" navigable="false">      
+      <attribute id="86" name="confOpt"/>      
+      <multiplicity id="87" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="14" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="88">    
+    <end type="SOURCE" refId="35" navigable="false">      
+      <attribute id="89" name="metric"/>      
+      <multiplicity id="90" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="91">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="92" name="dir"/>      
+      <multiplicity id="93" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="19" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="94">    
+    <end type="SOURCE" refId="17"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <nesting id="95">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="9"/>  
+  </nesting>  
+  <generalization id="96">    
+    <end type="SOURCE" refId="48"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="97">    
+    <end type="SOURCE" refId="1" navigable="false">      
+      <attribute id="98" name="branchOutgoing"/>      
+      <multiplicity id="99" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="100">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="101" name="bugReportMessages"/>      
+      <multiplicity id="102" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="103">    
+    <end type="SOURCE" refId="28"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="104">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="105" name="storedProject"/>      
+      <multiplicity id="106" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="107">    
+    <end type="SOURCE" refId="44" navigable="false">      
+      <attribute id="108" name="metric"/>      
+      <multiplicity id="109" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="110">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="111" name="clusternode"/>      
+      <multiplicity id="112" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="12" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="113">    
+    <end type="SOURCE" refId="49"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <generalization id="114">    
+    <end type="SOURCE" refId="31"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="115">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="116" name="project"/>      
+      <multiplicity id="117" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="118">    
+    <end type="SOURCE" refId="34"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="119">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="120" name="severity"/>      
+      <multiplicity id="121" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="122">    
+    <end type="SOURCE" refId="29" navigable="false">      
+      <attribute id="123" name="thread"/>      
+      <multiplicity id="124" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="27" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="125">    
+    <end type="SOURCE" refId="12" navigable="false">      
+      <attribute id="126" name="projects"/>      
+      <multiplicity id="127" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="128">    
+    <end type="SOURCE" refId="27" navigable="false">      
+      <attribute id="129" name="list"/>      
+      <multiplicity id="130" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="131">    
+    <end type="SOURCE" refId="48" navigable="false">      
+      <attribute id="132" name="project"/>      
+      <multiplicity id="133" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="134">    
+    <end type="SOURCE" refId="27" navigable="false">      
+      <attribute id="135" name="messages"/>      
+      <multiplicity id="136" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="137">    
+    <end type="SOURCE" refId="39"/>    
+    <end type="TARGET" refId="40"/>  
+  </generalization>  
+  <association id="138">    
+    <end type="SOURCE" refId="41" navigable="false">      
+      <attribute id="139" name="projectFile"/>      
+      <multiplicity id="140" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="141">    
+    <end type="SOURCE" refId="38"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="142">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="143" name="fileMeasurements"/>      
+      <multiplicity id="144" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="41" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="145">    
+    <end type="SOURCE" refId="30"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="146">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="147" name="nsMeasurements"/>      
+      <multiplicity id="148" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="35" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="149">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="150">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="151" name="reporter"/>      
+      <multiplicity id="152" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="153">    
+    <end type="SOURCE" refId="24" navigable="false">      
+      <attribute id="154" name="instance"/>      
+      <multiplicity id="155" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="16" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="156">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="157" name="plugin"/>      
+      <multiplicity id="158" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="37" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="159">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="160" name="mmMeasurements"/>      
+      <multiplicity id="161" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="30" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="162">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="163" name="bugs"/>      
+      <multiplicity id="164" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="165">    
+    <end type="SOURCE" refId="21" navigable="false">      
+      <attribute id="166" name="encapsulationUnit"/>      
+      <multiplicity id="167" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="20" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="168">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="169" name="priority"/>      
+      <multiplicity id="170" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="171">    
+    <end type="SOURCE" refId="42"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="172">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="173" name="copyFrom"/>      
+      <multiplicity id="174" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="175">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="176" name="parents"/>      
+      <multiplicity id="177" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="45" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="178">    
+    <end type="SOURCE" refId="21" navigable="false">      
+      <attribute id="179" name="metric"/>      
+      <multiplicity id="180" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="181">    
+    <end type="SOURCE" refId="26" navigable="false">      
+      <attribute id="182" name="messages"/>      
+      <multiplicity id="183" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="184">    
+    <end type="SOURCE" refId="33" navigable="false">      
+      <attribute id="185" name="metrics"/>      
+      <multiplicity id="186" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="187">    
+    <end type="SOURCE" refId="6" navigable="false">      
+      <attribute id="188" name="bugs"/>      
+      <multiplicity id="189" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="190">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="191" name="metricType"/>      
+      <multiplicity id="192" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="33" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="193">    
+    <end type="SOURCE" refId="27"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="194">    
+    <end type="SOURCE" refId="14" navigable="false">      
+      <attribute id="195" name="configurations"/>      
+      <multiplicity id="196" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="48" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="197">    
+    <end type="SOURCE" refId="26" navigable="false">      
+      <attribute id="198" name="threads"/>      
+      <multiplicity id="199" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="27" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="200">    
+    <end type="SOURCE" refId="41"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="201">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="202" name="reporter"/>      
+      <multiplicity id="203" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="204">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="205" name="executionUnits"/>      
+      <multiplicity id="206" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="22" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="207">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="208" name="execUnitMeasurements"/>      
+      <multiplicity id="209" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="23" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="210">    
+    <end type="SOURCE" refId="34" navigable="false">      
+      <attribute id="211" name="changeVersion"/>      
+      <multiplicity id="212" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="213">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="214" name="status"/>      
+      <multiplicity id="215" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="10" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="216">    
+    <end type="SOURCE" refId="27" navigable="false">      
+      <attribute id="217" name="measurements"/>      
+      <multiplicity id="218" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="28" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="219">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="220">    
+    <end type="SOURCE" refId="37" navigable="false">      
+      <attribute id="221" name="configurations"/>      
+      <multiplicity id="222" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="38" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="223">    
+    <end type="SOURCE" refId="20" navigable="false">      
+      <attribute id="224" name="measurements"/>      
+      <multiplicity id="225" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="21" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="226">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="227" name="projectVersion"/>      
+      <multiplicity id="228" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="229">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="230" name="state"/>      
+      <multiplicity id="231" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="42" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="232">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="233" name="encUnitMeasurements"/>      
+      <multiplicity id="234" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="21" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="235">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="236" name="incomingBranches"/>      
+      <multiplicity id="237" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="238">    
+    <end type="SOURCE" refId="8" navigable="false">      
+      <attribute id="239" name="bugs"/>      
+      <multiplicity id="240" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="241">    
+    <end type="SOURCE" refId="10" navigable="false">      
+      <attribute id="242" name="bugs"/>      
+      <multiplicity id="243" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="244">    
+    <end type="SOURCE" refId="34" navigable="false">      
+      <attribute id="245" name="measurements"/>      
+      <multiplicity id="246" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="35" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="247">    
+    <end type="SOURCE" refId="44" navigable="false">      
+      <attribute id="248" name="projectVersion"/>      
+      <multiplicity id="249" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="250">    
+    <end type="SOURCE" refId="19"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="251">    
+    <end type="SOURCE" refId="49" navigable="false">      
+      <attribute id="252" name="metric"/>      
+      <multiplicity id="253" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="254">    
+    <end type="SOURCE" refId="21"/>    
+    <end type="TARGET" refId="32"/>  
+  </generalization>  
+  <association id="255">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="256" name="projectVersions"/>      
+      <multiplicity id="257" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="258">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="259" name="encapsulationUnits"/>      
+      <multiplicity id="260" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="20" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="261">    
+    <end type="SOURCE" refId="36"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <generalization id="262">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="263">    
+    <end type="SOURCE" refId="20" navigable="false">      
+      <attribute id="264" name="namespace"/>      
+      <multiplicity id="265" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="34" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="266">    
+    <end type="SOURCE" refId="23" navigable="false">      
+      <attribute id="267" name="metric"/>      
+      <multiplicity id="268" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="269">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="270" name="mlThreadMeasurements"/>      
+      <multiplicity id="271" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="28" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="272">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="273">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="274" name="branches"/>      
+      <multiplicity id="275" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="276">    
+    <end type="SOURCE" refId="18" navigable="false">      
+      <attribute id="277" name="developer"/>      
+      <multiplicity id="278" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="279">    
+    <end type="SOURCE" refId="42" navigable="false">      
+      <attribute id="280" name="files"/>      
+      <multiplicity id="281" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="282">    
+    <end type="SOURCE" refId="26"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <generalization id="283">    
+    <end type="SOURCE" refId="37"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="284">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="285" name="resolution"/>      
+      <multiplicity id="286" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="287">    
+    <end type="SOURCE" refId="24"/>    
+    <end type="TARGET" refId="16"/>  
+  </realization>  
+  <generalization id="288">    
+    <end type="SOURCE" refId="43"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="289">    
+    <end type="SOURCE" refId="41" navigable="false">      
+      <attribute id="290" name="metric"/>      
+      <multiplicity id="291" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="292">    
+    <end type="SOURCE" refId="40"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="293">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="294" name="tags"/>      
+      <multiplicity id="295" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="50" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="296">    
+    <end type="SOURCE" refId="10"/>    
+    <end type="TARGET" refId="11"/>  
+  </nesting>  
+  <association id="297">    
+    <end type="SOURCE" refId="1" navigable="false">      
+      <attribute id="298" name="branchIncoming"/>      
+      <multiplicity id="299" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="300">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="301" name="developers"/>      
+      <multiplicity id="302" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="303">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="304" name="configOpts"/>      
+      <multiplicity id="305" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="48" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="306">    
+    <end type="SOURCE" refId="28" navigable="false">      
+      <attribute id="307" name="thread"/>      
+      <multiplicity id="308" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="27" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="309">    
+    <end type="SOURCE" refId="1" navigable="false">      
+      <attribute id="310" name="project"/>      
+      <multiplicity id="311" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="312">    
+    <end type="SOURCE" refId="29" navigable="false">      
+      <attribute id="313" name="measurements"/>      
+      <multiplicity id="314" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="30" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="315">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="7"/>  
+  </nesting>  
+  <association id="316">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="317" name="reportMessages"/>      
+      <multiplicity id="318" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="319">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="320" name="validFrom"/>      
+      <multiplicity id="321" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="322">    
+    <end type="SOURCE" refId="30" navigable="false">      
+      <attribute id="323" name="mail"/>      
+      <multiplicity id="324" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="325">    
+    <end type="SOURCE" refId="10"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="326">    
+    <end type="SOURCE" refId="49" navigable="false">      
+      <attribute id="327" name="storedProject"/>      
+      <multiplicity id="328" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="329">    
+    <end type="SOURCE" refId="26" navigable="false">      
+      <attribute id="330" name="storedProject"/>      
+      <multiplicity id="331" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="332">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="333" name="project"/>      
+      <multiplicity id="334" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="47" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="335">    
+    <end type="SOURCE" refId="19" navigable="false">      
+      <attribute id="336" name="files"/>      
+      <multiplicity id="337" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="338">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="339" name="versionMeasurements"/>      
+      <multiplicity id="340" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="44" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="341">    
+    <end type="SOURCE" refId="50"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="342">    
+    <end type="SOURCE" refId="34" navigable="false">      
+      <attribute id="343" name="lang"/>      
+      <multiplicity id="344" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="25" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="345">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="346" name="measurements"/>      
+      <multiplicity id="347" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="41" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="348">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="349" name="namespaces"/>      
+      <multiplicity id="350" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="34" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="351">    
+    <end type="SOURCE" refId="30" navigable="false">      
+      <attribute id="352" name="metric"/>      
+      <multiplicity id="353" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="354">    
+    <end type="SOURCE" refId="20" navigable="false">      
+      <attribute id="355" name="file"/>      
+      <multiplicity id="356" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="357">    
+    <end type="SOURCE" refId="22" navigable="false">      
+      <attribute id="358" name="encapsulationUnit"/>      
+      <multiplicity id="359" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="20" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="360">    
+    <end type="SOURCE" refId="29" navigable="false">      
+      <attribute id="361" name="parent"/>      
+      <multiplicity id="362" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="363">    
+    <end type="SOURCE" refId="29" navigable="false">      
+      <attribute id="364" name="sender"/>      
+      <multiplicity id="365" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="17" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="366">    
+    <end type="SOURCE" refId="43" navigable="false">      
+      <attribute id="367" name="versionFiles"/>      
+      <multiplicity id="368" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="369">    
+    <end type="SOURCE" refId="22" navigable="false">      
+      <attribute id="370" name="namespace"/>      
+      <multiplicity id="371" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="34" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="372">    
+    <end type="SOURCE" refId="29"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="373">    
+    <end type="SOURCE" refId="29" navigable="false">      
+      <attribute id="374" name="list"/>      
+      <multiplicity id="375" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="376">    
+    <end type="SOURCE" refId="47"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="377">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="378" name="bug"/>      
+      <multiplicity id="379" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="380">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="381" name="measurements"/>      
+      <multiplicity id="382" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="49" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="383">    
+    <end type="SOURCE" refId="22" navigable="false">      
+      <attribute id="384" name="file"/>      
+      <multiplicity id="385" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="40" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="386">    
+    <end type="SOURCE" refId="45" navigable="false">      
+      <attribute id="387" name="pk"/>      
+      <multiplicity id="388" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="46" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="389">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="390" name="mails"/>      
+      <multiplicity id="391" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="392">    
+    <end type="SOURCE" refId="35" navigable="false">      
+      <attribute id="393" name="namespace"/>      
+      <multiplicity id="394" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="34" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="395">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="396" name="bugs"/>      
+      <multiplicity id="397" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="398">    
+    <end type="SOURCE" refId="33"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="399">    
+    <end type="SOURCE" refId="20" navigable="false">      
+      <attribute id="400" name="execUnits"/>      
+      <multiplicity id="401" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="22" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="402">    
+    <end type="SOURCE" refId="22" navigable="false">      
+      <attribute id="403" name="measurements"/>      
+      <multiplicity id="404" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="23" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="405">    
+    <end type="SOURCE" refId="20"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="406">    
+    <end type="SOURCE" refId="50" navigable="false">      
+      <attribute id="407" name="projectVersion"/>      
+      <multiplicity id="408" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="409">    
+    <end type="SOURCE" refId="18"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="410">    
+    <end type="SOURCE" refId="47" navigable="false">      
+      <attribute id="411" name="mailingLists"/>      
+      <multiplicity id="412" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="413">    
+    <end type="SOURCE" refId="45" navigable="false">      
+      <attribute id="414" name="parent"/>      
+      <multiplicity id="415" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="416">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="417" name="aliases"/>      
+      <multiplicity id="418" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="18" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="419">    
+    <end type="SOURCE" refId="14"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="420">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="421" name="projectMeasurements"/>      
+      <multiplicity id="422" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="49" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="423">    
+    <end type="SOURCE" refId="34" navigable="false">      
+      <attribute id="424" name="encapsulationUnits"/>      
+      <multiplicity id="425" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="20" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="426">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <association id="427">    
+    <end type="SOURCE" refId="40" navigable="false">      
+      <attribute id="428" name="validUntil"/>      
+      <multiplicity id="429" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="43" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="430">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <association id="431">    
+    <end type="SOURCE" refId="37" navigable="false">      
+      <attribute id="432" name="supportedMetrics"/>      
+      <multiplicity id="433" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="434">    
+    <end type="SOURCE" refId="12"/>    
+    <end type="TARGET" refId="15"/>  
+  </generalization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-fds.png b/alitheia/core/src/main/java/sqooss-service-fds.png
new file mode 100644
index 000000000..ddc86372b
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-fds.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-fds.ucls b/alitheia/core/src/main/java/sqooss-service-fds.ucls
new file mode 100644
index 000000000..60f392db1
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-fds.ucls
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.service.fds.BugDBEvent" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/BugDBEvent.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="695" y="121"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.service.fds.CheckoutException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/CheckoutException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="697" y="185"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.service.fds.FDSException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/FDSException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="695" y="263"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.impl.service.fds.DiskUtil" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/DiskUtil.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="158" y="67"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="eu.sqooss.impl.service.fds.FDSServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/FDSServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="153" y="132"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="eu.sqooss.impl.service.fds.FDSServiceImpl.CleanupThread" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/FDSServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="349" y="132"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="eu.sqooss.impl.service.fds.InMemoryCheckoutImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/InMemoryCheckoutImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="167" y="207"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" name="eu.sqooss.impl.service.fds.OnDiskCheckoutImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/OnDiskCheckoutImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="173" y="273"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" name="eu.sqooss.impl.service.fds.TimelineImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/fds/TimelineImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="179" y="335"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="10" language="java" name="eu.sqooss.service.fds.FDSService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/FDSService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-54" y="132"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="11" language="java" name="eu.sqooss.service.fds.FileTypeMatcher" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/FileTypeMatcher.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="510" y="190"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="12" language="java" name="eu.sqooss.service.fds.FileTypeMatcher.FileType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/FileTypeMatcher.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="511" y="287"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <interface id="13" language="java" name="eu.sqooss.service.fds.InMemoryCheckout" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/InMemoryCheckout.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-52" y="208"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="14" language="java" name="eu.sqooss.service.fds.InMemoryDirectory" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/InMemoryDirectory.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="-60" y="310"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="15" language="java" name="eu.sqooss.service.fds.MailingListEvent" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/MailingListEvent.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="505" y="119"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="16" language="java" name="eu.sqooss.service.fds.OnDiskCheckout" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/OnDiskCheckout.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="338" y="208"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="17" language="java" name="eu.sqooss.service.fds.ProjectEvent" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/ProjectEvent.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="593" y="37"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="18" language="java" name="eu.sqooss.service.fds.RepositoryEvent" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/RepositoryEvent.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="398" y="40"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="19" language="java" name="eu.sqooss.service.fds.Timeline" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/Timeline.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="343" y="341"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <enumeration id="20" language="java" name="eu.sqooss.service.fds.Timeline.ResourceType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/fds/Timeline.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="345" y="423"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <realization id="21">    
+    <end type="SOURCE" refId="7"/>    
+    <end type="TARGET" refId="13"/>  
+  </realization>  
+  <association id="22">    
+    <end type="SOURCE" refId="14" navigable="false">      
+      <attribute id="23" name="directories"/>      
+      <multiplicity id="24" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="14" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="25">    
+    <end type="SOURCE" refId="11" navigable="false">      
+      <attribute id="26" name="lookupTable"/>      
+      <multiplicity id="27" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="12" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="28">    
+    <end type="SOURCE" refId="14" navigable="false">      
+      <attribute id="29" name="checkout"/>      
+      <multiplicity id="30" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="13" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="31">    
+    <end type="SOURCE" refId="15"/>    
+    <end type="TARGET" refId="17"/>  
+  </generalization>  
+  <association id="32">    
+    <end type="SOURCE" refId="14" navigable="false">      
+      <attribute id="33" name="parentDirectory"/>      
+      <multiplicity id="34" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="14" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="35">    
+    <end type="SOURCE" refId="7" navigable="false">      
+      <attribute id="36" name="root"/>      
+      <multiplicity id="37" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="14" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="38">    
+    <end type="SOURCE" refId="11"/>    
+    <end type="TARGET" refId="12"/>  
+  </nesting>  
+  <association id="39">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="40" name="checkoutCache"/>      
+      <multiplicity id="41" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="16" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="42">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="16"/>  
+  </realization>  
+  <realization id="43">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="19"/>  
+  </realization>  
+  <nesting id="44">    
+    <end type="SOURCE" refId="19"/>    
+    <end type="TARGET" refId="20"/>  
+  </nesting>  
+  <generalization id="45">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="17"/>  
+  </generalization>  
+  <generalization id="46">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="3"/>  
+  </generalization>  
+  <realization id="47">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="10"/>  
+  </realization>  
+  <association id="48">    
+    <end type="SOURCE" refId="11" navigable="false">      
+      <attribute id="49" name="instance"/>      
+      <multiplicity id="50" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="11" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="51">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <generalization id="52">    
+    <end type="SOURCE" refId="18"/>    
+    <end type="TARGET" refId="17"/>  
+  </generalization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-logging.png b/alitheia/core/src/main/java/sqooss-service-logging.png
new file mode 100644
index 000000000..3d7b95f4a
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-logging.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-logging.ucls b/alitheia/core/src/main/java/sqooss-service-logging.ucls
new file mode 100644
index 000000000..e9d933490
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-logging.ucls
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.logging.CyclicLogger" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/logging/CyclicLogger.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="186" y="253"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.logging.LoggerImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/logging/LoggerImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="138" x="118" y="79"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.logging.LogManagerImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/logging/LogManagerImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="186" y="180"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="4" language="java" name="eu.sqooss.service.logging.Logger" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/logging/Logger.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="389" y="108"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="5" language="java" name="eu.sqooss.service.logging.LogManager" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/logging/LogManager.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="410" y="180"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <association id="6">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="7" name="logManager"/>      
+      <multiplicity id="8" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="9">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
+  <association id="10">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="11" name="cyclicLogger"/>      
+      <multiplicity id="12" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="13">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="14" name="loggers"/>      
+      <multiplicity id="15" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="16">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="5"/>  
+  </realization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-metric.png b/alitheia/core/src/main/java/sqooss-service-metric.png
new file mode 100644
index 000000000..d501b65d9
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-metric.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-metric.ucls b/alitheia/core/src/main/java/sqooss-service-metric.ucls
new file mode 100644
index 000000000..c14d69567
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-metric.ucls
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.service.abstractmetric.AbstractMetric" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/AbstractMetric.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="711" y="328"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="2" language="java" name="eu.sqooss.service.abstractmetric.AlitheiaPlugin" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/AlitheiaPlugin.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="711" y="247"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <annotation id="3" language="java" name="eu.sqooss.service.abstractmetric.MetricDeclarations" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/MetricDeclarations.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="895" y="176"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </annotation>  
+  <annotation id="4" language="java" name="eu.sqooss.service.abstractmetric.MetricDecl" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/MetricDecl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="896" y="112"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </annotation>  
+  <class id="5" language="java" name="eu.sqooss.service.abstractmetric.AlreadyProcessingException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/AlreadyProcessingException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1083" y="152"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="6" language="java" name="eu.sqooss.service.abstractmetric.InvocationOrder" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/InvocationOrder.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="711" y="177"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="7" language="java" name="eu.sqooss.service.abstractmetric.MetricMismatchException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/MetricMismatchException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1082" y="229"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" name="eu.sqooss.service.abstractmetric.PluginAnnotationProcessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/PluginAnnotationProcessor.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="713" y="104"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" name="eu.sqooss.service.abstractmetric.Result" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/Result.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="892" y="238"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="10" language="java" name="eu.sqooss.service.abstractmetric.Result.ResultType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/Result.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="893" y="331"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <annotation id="11" language="java" name="eu.sqooss.service.abstractmetric.SchedulerHints" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/abstractmetric/SchedulerHints.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="895" y="46"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </annotation>  
+  <class id="12" language="java" name="eu.sqooss.service.metricactivator.MetricActivationException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/metricactivator/MetricActivationException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1080" y="86"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="13" language="java" name="eu.sqooss.impl.service.metricactivator.MetricActivatorImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/metricactivator/MetricActivatorImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="51" width="171" x="209" y="79"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="14" language="java" 
+    name="eu.sqooss.impl.service.metricactivator.MetricActivatorImpl.DecreasingLongComparator" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/metricactivator/MetricActivatorImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="51" width="187" x="16" y="226"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="15" language="java" name="eu.sqooss.impl.service.metricactivator.MetricActivatorImpl.MetricSchedulerJob" 
+    project="core" file="/core/src/main/java/eu/sqooss/impl/service/metricactivator/MetricActivatorImpl.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="488" y="252"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="16" language="java" name="eu.sqooss.impl.service.metricactivator.MetricActivatorImpl.RandomizedComparator" 
+    project="core" file="/core/src/main/java/eu/sqooss/impl/service/metricactivator/MetricActivatorImpl.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="298" y="255"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="17" language="java" name="eu.sqooss.impl.service.metricactivator.MetricActivatorJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/metricactivator/MetricActivatorJob.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="51" width="171" x="213" y="307"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="18" language="java" name="eu.sqooss.service.metricactivator.MetricActivator" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/metricactivator/MetricActivator.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="513" y="107"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <association id="19">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="20" name="ma"/>      
+      <multiplicity id="21" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="18" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="22">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="2"/>  
+  </realization>  
+  <nesting id="23">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="10"/>  
+  </nesting>  
+  <nesting id="24">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="15"/>  
+  </nesting>  
+  <association id="25">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="26" name="metric"/>      
+      <multiplicity id="27" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="1" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="28">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="14"/>  
+  </nesting>  
+  <association id="29">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="30" name="type"/>      
+      <multiplicity id="31" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="10" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="32">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="18"/>  
+  </realization>  
+  <association id="33">    
+    <end type="SOURCE" refId="15" navigable="false">      
+      <attribute id="34" name="m"/>      
+      <multiplicity id="35" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="36">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="16"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-pa.png b/alitheia/core/src/main/java/sqooss-service-pa.png
new file mode 100644
index 000000000..47438c6ba
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-pa.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-pa.ucls b/alitheia/core/src/main/java/sqooss-service-pa.ucls
new file mode 100644
index 000000000..e8edd45d9
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-pa.ucls
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <interface id="1" language="java" name="eu.sqooss.service.pa.ConfigUtils" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/pa/ConfigUtils.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="171" y="132"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.pa.PAServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/pa/PAServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="348" y="113"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.pa.PAServiceImpl.PluginUninstallJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/pa/PAServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="348" y="202"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="4" language="java" name="eu.sqooss.service.pa.PluginAdmin" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/pa/PluginAdmin.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="101" x="448" y="90"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="5" language="java" name="eu.sqooss.service.pa.PluginConfig" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/pa/PluginConfig.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="494" y="199"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="6" language="java" name="eu.sqooss.service.pa.PluginInfo" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/pa/PluginInfo.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="171" y="235"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="7" language="java" name="eu.sqooss.service.pa.PluginInfo.ConfigurationType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/pa/PluginInfo.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="170" y="315"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <nesting id="8">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="3"/>  
+  </nesting>  
+  <association id="9">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="10" name="registeredPlugins"/>      
+      <multiplicity id="11" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="12">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="7"/>  
+  </nesting>  
+  <realization id="13">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-rest.png b/alitheia/core/src/main/java/sqooss-service-rest.png
new file mode 100644
index 000000000..3fa5e0597
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-rest.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-rest.ucls b/alitheia/core/src/main/java/sqooss-service-rest.ucls
new file mode 100644
index 000000000..f50414211
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-rest.ucls
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.rest.ResteasyServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/rest/ResteasyServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="112" y="133"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.rest.ResteasyServlet" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/rest/ResteasyServlet.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="111" y="208"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.rest.RestServiceRegistry" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/rest/RestServiceRegistry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="144" x="43" y="268"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="4" language="java" name="eu.sqooss.service.rest.RestService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/rest/RestService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="286" y="136"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="5" language="java" name="eu.sqooss.service.rest.RestServiceApp" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/rest/RestServiceApp.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="289" y="220"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <association id="6">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="7" name="instance"/>      
+      <multiplicity id="8" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="9">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-scheduler.png b/alitheia/core/src/main/java/sqooss-service-scheduler.png
new file mode 100644
index 000000000..e35d0ec1e
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-scheduler.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-scheduler.ucls b/alitheia/core/src/main/java/sqooss-service-scheduler.ucls
new file mode 100644
index 000000000..8ea5232f1
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-scheduler.ucls
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.scheduler.JobPriorityComparator" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/scheduler/JobPriorityComparator.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="696" y="96"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.scheduler.SchedulerServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/scheduler/SchedulerServiceImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="144" y="71"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.scheduler.WorkerThreadImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/scheduler/WorkerThreadImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="144" y="234"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.impl.service.scheduler.WorkerThreadImpl.TemporaryWorkerThread" 
+    project="core" file="/core/src/main/java/eu/sqooss/impl/service/scheduler/WorkerThreadImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="148" y="327"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="eu.sqooss.service.scheduler.Job" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/Job.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="412" y="167"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="6" language="java" name="eu.sqooss.service.scheduler.Job.State" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/Job.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="529" y="38"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <interface id="7" language="java" name="eu.sqooss.service.scheduler.JobStateListener" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/JobStateListener.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="654" y="165"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="8" language="java" name="eu.sqooss.service.scheduler.ResumePoint" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/ResumePoint.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="653" y="252"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="9" language="java" name="eu.sqooss.service.scheduler.Scheduler" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/Scheduler.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="415" y="322"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="10" language="java" name="eu.sqooss.service.scheduler.SchedulerException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/SchedulerException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="589" y="326"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="11" language="java" name="eu.sqooss.service.scheduler.SchedulerStats" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/SchedulerStats.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="399" y="27"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="12" language="java" name="eu.sqooss.service.scheduler.WorkerThread" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/scheduler/WorkerThread.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="143" y="158"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <nesting id="13">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <association id="14">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="15" name="blockedQueue"/>      
+      <multiplicity id="16" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="17">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="12"/>  
+  </realization>  
+  <association id="18">    
+    <end type="SOURCE" refId="11" navigable="false">      
+      <attribute id="19" name="runJobs"/>      
+      <multiplicity id="20" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="21">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="22" name="stats"/>      
+      <multiplicity id="23" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="11" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="24">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="25" name="myWorkerThreads"/>      
+      <multiplicity id="26" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="12" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="27">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="28" name="m_scheduler"/>      
+      <multiplicity id="29" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="30">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="31" name="resumePoint"/>      
+      <multiplicity id="32" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="33">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="34" name="listeners"/>      
+      <multiplicity id="35" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="7" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="36">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="37" name="m_dependees"/>      
+      <multiplicity id="38" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="39">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="40" name="failedQueue"/>      
+      <multiplicity id="41" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="42">    
+    <end type="SOURCE" refId="4" navigable="false">      
+      <attribute id="43" name="worker"/>      
+      <multiplicity id="44" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="45">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="46" name="m_state"/>      
+      <multiplicity id="47" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="48">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="49" name="workQueue"/>      
+      <multiplicity id="50" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="51">    
+    <end type="SOURCE" refId="4" navigable="false">      
+      <attribute id="52" name="job"/>      
+      <multiplicity id="53" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="54">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <association id="55">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="56" name="m_worker"/>      
+      <multiplicity id="57" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="12" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="58">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="59" name="m_job"/>      
+      <multiplicity id="60" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="61">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="62" name="m_scheduler"/>      
+      <multiplicity id="63" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="64">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="9"/>  
+  </realization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-tds.png b/alitheia/core/src/main/java/sqooss-service-tds.png
new file mode 100644
index 000000000..f7578da39
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-tds.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-tds.ucls b/alitheia/core/src/main/java/sqooss-service-tds.ucls
new file mode 100644
index 000000000..de0882b74
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-tds.ucls
@@ -0,0 +1,564 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.tds.DataAccessorFactory" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/tds/DataAccessorFactory.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="272" y="47"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.tds.ProjectDataAccessorImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/tds/ProjectDataAccessorImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="292" y="188"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.tds.TDSServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/tds/TDSServiceImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="347" y="386"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.impl.service.tds.diff.DiffChunkImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/tds/diff/DiffChunkImpl.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="476" y="127"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="eu.sqooss.impl.service.tds.diff.UnifiedDiffParser" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/tds/diff/UnifiedDiffParser.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="471" y="205"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="eu.sqooss.service.tds.AccessorException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/AccessorException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="761" y="117"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="eu.sqooss.service.tds.AnnotatedLine" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/AnnotatedLine.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="668" y="190"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="8" language="java" name="eu.sqooss.service.tds.BTSAccessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSAccessor.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="82" y="191"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="9" language="java" name="eu.sqooss.service.tds.BTSEntry" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="756" y="338"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="10" language="java" name="eu.sqooss.service.tds.BTSEntry.BTSEntryAttachement" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="582" y="432"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="11" language="java" name="eu.sqooss.service.tds.BTSEntry.BTSEntryComment" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="761" y="441"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="12" language="java" name="eu.sqooss.service.tds.BTSEntry.BugPriority" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="917" y="342"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <enumeration id="13" language="java" name="eu.sqooss.service.tds.BTSEntry.BugResolution" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="916" y="262"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <enumeration id="14" language="java" name="eu.sqooss.service.tds.BTSEntry.BugSeverity" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="919" y="408"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <enumeration id="15" language="java" name="eu.sqooss.service.tds.BTSEntry.BugStatus" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/BTSEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="919" y="470"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="16" language="java" name="eu.sqooss.service.tds.CommitCopyEntry" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/CommitCopyEntry.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="470" y="361"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="17" language="java" name="eu.sqooss.service.tds.CommitLog" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/CommitLog.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="254" y="457"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="18" language="java" name="eu.sqooss.service.tds.DataAccessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/DataAccessor.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="56" y="298"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="19" language="java" name="eu.sqooss.service.tds.Diff" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/Diff.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="470" y="287"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="20" language="java" name="eu.sqooss.service.tds.DiffChunk" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/DiffChunk.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="413" y="34"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <enumeration id="21" language="java" name="eu.sqooss.service.tds.DiffChunk.DiffOp" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/DiffChunk.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="578" y="35"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="22" language="java" name="eu.sqooss.service.tds.DiffFactory" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/DiffFactory.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="85" y="103"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="23" language="java" name="eu.sqooss.service.tds.InvalidAccessorException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/InvalidAccessorException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="82" y="432"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="24" language="java" name="eu.sqooss.service.tds.InvalidProjectRevisionException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/InvalidProjectRevisionException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="757" y="0"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="25" language="java" name="eu.sqooss.service.tds.InvalidRepositoryException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/InvalidRepositoryException.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="761" y="55"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="26" language="java" name="eu.sqooss.service.tds.MailAccessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/MailAccessor.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="229" y="386"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <enumeration id="27" language="java" name="eu.sqooss.service.tds.PathChangeType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/PathChangeType.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="270" y="-11"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <interface id="28" language="java" name="eu.sqooss.service.tds.ProjectAccessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/ProjectAccessor.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="285" y="108"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="29" language="java" name="eu.sqooss.service.tds.Revision" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/Revision.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="674" y="278"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <interface id="30" language="java" name="eu.sqooss.service.tds.SCMAccessor" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/SCMAccessor.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="199" y="298"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <class id="31" language="java" name="eu.sqooss.service.tds.SCMNode" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/SCMNode.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="803" y="197"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="32" language="java" name="eu.sqooss.service.tds.SCMNodeType" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/SCMNodeType.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="923" y="132"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="33" language="java" name="eu.sqooss.service.tds.TDSException" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/TDSException.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="608" y="114"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="34" language="java" name="eu.sqooss.service.tds.TDSService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/tds/TDSService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="413" y="465"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <realization id="35">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="19"/>  
+  </realization>  
+  <association id="36">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="37" name="revision"/>      
+      <multiplicity id="38" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="39">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="14"/>  
+  </nesting>  
+  <association id="40">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="41" name="state"/>      
+      <multiplicity id="42" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="15" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="43">    
+    <end type="SOURCE" refId="26"/>    
+    <end type="TARGET" refId="18"/>  
+  </generalization>  
+  <association id="44">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="45" name="attachementlist"/>      
+      <multiplicity id="46" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="10" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="47">    
+    <end type="SOURCE" refId="22" navigable="false">      
+      <attribute id="48" name="instance"/>      
+      <multiplicity id="49" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="22" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="50">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="33"/>  
+  </generalization>  
+  <association id="51">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="52" name="mailAccessor"/>      
+      <multiplicity id="53" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="54">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="55" name="scmAccessor"/>      
+      <multiplicity id="56" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="30" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="57">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="58" name="revStart"/>      
+      <multiplicity id="59" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="60">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="34"/>  
+  </realization>  
+  <association id="61">    
+    <end type="SOURCE" refId="7" navigable="false">      
+      <attribute id="62" name="rev"/>      
+      <multiplicity id="63" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="64">    
+    <end type="SOURCE" refId="24"/>    
+    <end type="TARGET" refId="33"/>  
+  </generalization>  
+  <association id="65">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="66" name="accessorPool">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="67" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="68">    
+    <end type="SOURCE" refId="4" navigable="false">      
+      <attribute id="69" name="diffOp"/>      
+      <multiplicity id="70" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="21" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="71">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="72" name="commentslist"/>      
+      <multiplicity id="73" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="11" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="74">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="75" name="type"/>      
+      <multiplicity id="76" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="32" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="77">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="78" name="btsAccessor"/>      
+      <multiplicity id="79" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="80">    
+    <end type="SOURCE" refId="31" navigable="false">      
+      <attribute id="81" name="children"/>      
+      <multiplicity id="82" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="31" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="83">    
+    <end type="SOURCE" refId="16" navigable="false">      
+      <attribute id="84" name="fromRev"/>      
+      <multiplicity id="85" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="86">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="87" name="priority"/>      
+      <multiplicity id="88" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="12" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="89">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="90" name="revEnd"/>      
+      <multiplicity id="91" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="92">    
+    <end type="SOURCE" refId="23"/>    
+    <end type="TARGET" refId="33"/>  
+  </generalization>  
+  <association id="93">    
+    <end type="SOURCE" refId="23" navigable="false">      
+      <attribute id="94" name="da"/>      
+      <multiplicity id="95" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="18" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="96">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="15"/>  
+  </nesting>  
+  <association id="97">    
+    <end type="SOURCE" refId="16" navigable="false">      
+      <attribute id="98" name="toRev"/>      
+      <multiplicity id="99" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="29" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="100">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="28"/>  
+  </realization>  
+  <association id="101">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="102" name="resolution"/>      
+      <multiplicity id="103" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="13" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="104">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="18"/>  
+  </generalization>  
+  <realization id="105">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="20"/>  
+  </realization>  
+  <nesting id="106">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="11"/>  
+  </nesting>  
+  <association id="107">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="108" name="severity"/>      
+      <multiplicity id="109" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="14" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="110">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="10"/>  
+  </nesting>  
+  <generalization id="111">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="33"/>  
+  </generalization>  
+  <generalization id="112">    
+    <end type="SOURCE" refId="30"/>    
+    <end type="TARGET" refId="18"/>  
+  </generalization>  
+  <nesting id="113">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="13"/>  
+  </nesting>  
+  <nesting id="114">    
+    <end type="SOURCE" refId="20"/>    
+    <end type="TARGET" refId="21"/>  
+  </nesting>  
+  <nesting id="115">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="12"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-updater.png b/alitheia/core/src/main/java/sqooss-service-updater.png
new file mode 100644
index 000000000..5ea160e9a
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-updater.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-updater.ucls b/alitheia/core/src/main/java/sqooss-service-updater.ucls
new file mode 100644
index 000000000..ba3f5b212
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-updater.ucls
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.updater.OhlohUpdater" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/updater/OhlohUpdater.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="228" y="96"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.updater.UpdaterJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/updater/UpdaterJob.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="576" y="138"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.updater.UpdaterServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/updater/UpdaterServiceImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="227" y="260"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.impl.service.updater.UpdaterServiceImpl.DependencyJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/updater/UpdaterServiceImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="226" y="331"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="5" language="java" name="eu.sqooss.service.updater.MetadataUpdater" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/MetadataUpdater.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="420" y="137"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <annotation id="6" language="java" name="eu.sqooss.service.updater.Parser" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/Parser.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="420" y="68"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </annotation>  
+  <annotation id="7" language="java" name="eu.sqooss.service.updater.Updater" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/Updater.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="567" y="65"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </annotation>  
+  <class id="8" language="java" name="eu.sqooss.service.updater.UpdaterBaseJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/UpdaterBaseJob.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="225" y="181"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="9" language="java" name="eu.sqooss.service.updater.UpdaterService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/UpdaterService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="406" y="258"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <enumeration id="10" language="java" name="eu.sqooss.service.updater.UpdaterService.UpdaterStage" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/updater/UpdaterService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="573" y="263"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <generalization id="11">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="8"/>  
+  </generalization>  
+  <realization id="12">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="9"/>  
+  </realization>  
+  <nesting id="13">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <nesting id="14">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="10"/>  
+  </nesting>  
+  <association id="15">    
+    <end type="SOURCE" refId="8" navigable="false">      
+      <attribute id="16" name="updater"/>      
+      <multiplicity id="17" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="18">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="19" name="mu"/>      
+      <multiplicity id="20" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-util.png b/alitheia/core/src/main/java/sqooss-service-util.png
new file mode 100644
index 000000000..2a7266498
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-util.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-util.ucls b/alitheia/core/src/main/java/sqooss-service-util.ucls
new file mode 100644
index 000000000..e4f1f7220
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-util.ucls
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.service.util.BidiMap" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/BidiMap.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="104" x="122" y="67"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.service.util.BundleActivatorBase" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/BundleActivatorBase.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="147" x="121" y="184"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.service.util.FileUtils" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/FileUtils.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="51" width="101" x="315" y="72"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <enumeration id="4" language="java" name="eu.sqooss.service.util.FileUtils.FindOpt" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/FileUtils.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="521" y="99"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </enumeration>  
+  <class id="5" language="java" name="eu.sqooss.service.util.GraphTS" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/GraphTS.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="370" y="198"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="eu.sqooss.service.util.GraphTS.Vertex" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/GraphTS.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="528" y="195"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="eu.sqooss.service.util.Pair" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/Pair.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="200" y="279"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" name="eu.sqooss.service.util.StringUtils" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/StringUtils.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="377" y="276"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" name="eu.sqooss.service.util.URIUtills" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/util/URIUtills.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="527" y="275"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <nesting id="10">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <association id="11">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="12" name="vertexList"/>      
+      <multiplicity id="13" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="14">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/main/java/sqooss-service-webadmin.png b/alitheia/core/src/main/java/sqooss-service-webadmin.png
new file mode 100644
index 000000000..d5bb972f1
Binary files /dev/null and b/alitheia/core/src/main/java/sqooss-service-webadmin.png differ
diff --git a/alitheia/core/src/main/java/sqooss-service-webadmin.ucls b/alitheia/core/src/main/java/sqooss-service-webadmin.ucls
new file mode 100644
index 000000000..811149f88
--- /dev/null
+++ b/alitheia/core/src/main/java/sqooss-service-webadmin.ucls
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.7" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="eu.sqooss.impl.service.webadmin.AbstractView" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/AbstractView.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="342" y="31"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="eu.sqooss.impl.service.webadmin.AdminServlet" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/AdminServlet.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="346" y="189"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="eu.sqooss.impl.service.webadmin.AdminServlet.TranslationProxy" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/AdminServlet.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="349" y="280"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="eu.sqooss.impl.service.webadmin.PluginsView" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/PluginsView.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="343" y="113"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="eu.sqooss.impl.service.webadmin.ProjectDeleteJob" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/ProjectDeleteJob.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="350" y="347"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="eu.sqooss.impl.service.webadmin.ProjectsView" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/ProjectsView.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="570" y="191"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="eu.sqooss.impl.service.webadmin.WebAdminRenderer" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/WebAdminRenderer.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="565" y="95"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" name="eu.sqooss.impl.service.webadmin.WebadminServiceImpl" project="core" 
+    file="/core/src/main/java/eu/sqooss/impl/service/webadmin/WebadminServiceImpl.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="107" y="313"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="9" language="java" name="eu.sqooss.service.webadmin.WebadminService" project="core" 
+    file="/core/src/main/java/eu/sqooss/service/webadmin/WebadminService.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="104" y="223"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <generalization id="10">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="1"/>  
+  </generalization>  
+  <association id="11">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="12" name="projectsView">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="13" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="14">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="3"/>  
+  </nesting>  
+  <realization id="15">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="9"/>  
+  </realization>  
+  <association id="16">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="17" name="tr">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="18" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="19">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="1"/>  
+  </generalization>  
+  <association id="20">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="21" name="webadmin"/>      
+      <multiplicity id="22" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="23">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="24" name="pluginsView">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="25" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="4" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="26">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="27" name="adminView">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="28" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="7" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="29">    
+    <end type="SOURCE" refId="7"/>    
+    <end type="TARGET" refId="1"/>  
+  </generalization>  
+  <association id="30">    
+    <end type="SOURCE" refId="2" navigable="false">      
+      <attribute id="31" name="pluginsView">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="32" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="4" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    sort-features="false" accessors="true" visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/alitheia/core/src/test/java/eu/sqooss/developer/test/DeveloperDBTest.java b/alitheia/core/src/test/java/eu/sqooss/developer/test/DeveloperDBTest.java
new file mode 100644
index 000000000..ba0ac692a
--- /dev/null
+++ b/alitheia/core/src/test/java/eu/sqooss/developer/test/DeveloperDBTest.java
@@ -0,0 +1,163 @@
+package eu.sqooss.developer.test;
+
+import static org.junit.Assert.*;
+
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.TreeSet;
+
+import javassist.expr.NewExpr;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import eu.sqooss.impl.service.admin.AdminServiceImpl;
+import eu.sqooss.impl.service.db.DBServiceImpl;
+import eu.sqooss.service.admin.actions.RunTimeInfo;
+import eu.sqooss.service.db.Developer;
+import eu.sqooss.service.db.DeveloperAlias;
+import eu.sqooss.service.db.DeveloperDB;
+import eu.sqooss.service.db.StoredProject;
+
+public class DeveloperDBTest {
+
+    static DBServiceImpl impl;
+    static long failid;
+    static long successid;
+	
+	 @BeforeClass
+	    public static void setUp() {
+	        impl = new DBServiceImpl();
+	    }
+
+	
+	@Test
+	public void testGetDeveloperByEmailStringStoredProject() {
+		String email = "boooom";
+		
+		Developer developer= new Developer();
+		DeveloperAlias alias = new DeveloperAlias();
+		alias.setEmail(email);
+		
+		StoredProject storedProject = new StoredProject();
+		storedProject.setDevelopers(new HashSet<Developer>());
+		storedProject.getDevelopers().add(developer);
+		
+		developer.setAliases(new HashSet<DeveloperAlias>());
+		developer.getAliases().add(alias);
+		
+        impl.addRecord(developer);
+        
+        DeveloperDB dbd = new DeveloperDB();
+       
+        Developer retrievedDeveloper = dbd.getDeveloperByEmail(email, storedProject);
+		
+        assertNotNull(retrievedDeveloper);
+        
+	}
+
+	@Test
+	public void testGetDeveloperByEmailStringStoredProjectBoolean() {
+		String email = "boooom";
+		
+		Developer developer= new Developer();
+		DeveloperAlias alias = new DeveloperAlias();
+		alias.setEmail(email);
+		
+		StoredProject storedProject = new StoredProject();
+		storedProject.setDevelopers(new HashSet<Developer>());
+		storedProject.getDevelopers().add(developer);
+		
+		developer.setAliases(new HashSet<DeveloperAlias>());
+		developer.getAliases().add(alias);
+		
+        impl.addRecord(developer);
+        
+        DeveloperDB dbd = new DeveloperDB();
+       
+        Developer retrievedDeveloper;
+        retrievedDeveloper = dbd.getDeveloperByEmail(email, storedProject, false);
+		
+        assertNull(retrievedDeveloper);
+        
+        retrievedDeveloper = dbd.getDeveloperByEmail(email, storedProject, true);
+        
+        assertNotNull(retrievedDeveloper);
+	}
+
+	@Test
+	public void testGetDeveloperByUsernameStringStoredProject() {
+		String username = "name";
+		
+		Developer developer= new Developer();
+
+		developer.setUsername(username);
+		
+		StoredProject storedProject = new StoredProject();
+		storedProject.setDevelopers(new HashSet<Developer>());
+		storedProject.getDevelopers().add(developer);
+
+        impl.addRecord(developer);
+        
+        DeveloperDB dbd = new DeveloperDB();
+       
+        Developer retrievedDeveloper = dbd.getDeveloperByUsername(username, storedProject);
+		
+        assertNull(retrievedDeveloper);
+        
+        
+	}
+
+	@Test
+	public void testGetDeveloperByUsernameStringStoredProjectBoolean() {
+		String username = "name";
+		
+		Developer developer= new Developer();
+
+		developer.setUsername(username);
+		
+		StoredProject storedProject = new StoredProject();
+		storedProject.setDevelopers(new HashSet<Developer>());
+		storedProject.getDevelopers().add(developer);
+
+        impl.addRecord(developer);
+        
+        DeveloperDB dbd = new DeveloperDB();
+       
+        Developer retrievedDeveloper;
+        retrievedDeveloper = dbd.getDeveloperByUsername(username, storedProject, false);
+		
+        assertNull(retrievedDeveloper);
+        
+        retrievedDeveloper = dbd.getDeveloperByUsername(username, storedProject, true);
+        
+        assertNotNull(retrievedDeveloper);
+	}
+
+	@Test
+	public void testGetDeveloperByName() {
+		String name = "name";
+		
+		Developer developer= new Developer();
+
+		developer.setName(name);
+		
+		StoredProject storedProject = new StoredProject();
+		storedProject.setDevelopers(new HashSet<Developer>());
+		storedProject.getDevelopers().add(developer);
+
+        impl.addRecord(developer);
+        
+        DeveloperDB dbd = new DeveloperDB();
+        
+        Developer retrievedDeveloper;
+        retrievedDeveloper = dbd.getDeveloperByUsername(name, storedProject, false);
+		
+        assertNull(retrievedDeveloper);
+        
+        retrievedDeveloper = dbd.getDeveloperByUsername(name, storedProject, true);
+        
+        assertNotNull(retrievedDeveloper);
+	}
+
+}
diff --git a/alitheia/core/src/test/java/eu/sqooss/mail/test/MailingListTest.java b/alitheia/core/src/test/java/eu/sqooss/mail/test/MailingListTest.java
new file mode 100644
index 000000000..800474102
--- /dev/null
+++ b/alitheia/core/src/test/java/eu/sqooss/mail/test/MailingListTest.java
@@ -0,0 +1,114 @@
+package eu.sqooss.mail.test;
+
+import static org.junit.Assert.*;
+
+
+import java.util.HashSet;
+
+
+import java.util.Set;
+import org.junit.Test;
+
+import eu.sqooss.service.db.MailMessage;
+import eu.sqooss.service.db.MailingList;
+import eu.sqooss.service.db.MailingListThread;
+
+public class MailingListTest {
+
+	@Test
+	public void testGetMessages() {
+		MailingList ml = new MailingList();
+		
+		ml.setThreads(new HashSet<MailingListThread>());
+		
+		MailingListThread  mlthread1 = new MailingListThread();
+		HashSet<MailMessage> mlthread1set = new HashSet<MailMessage>();
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		ml.getThreads().add(mlthread1);
+		
+		MailingListThread  mlthread2 = new MailingListThread();
+		HashSet<MailMessage> mlthread2set = new HashSet<MailMessage>();
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		ml.getThreads().add(mlthread2);
+		
+		
+		MailingListThread  mlthread3 = new MailingListThread();
+		HashSet<MailMessage> mlthread3set = new HashSet<MailMessage>();
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		ml.getThreads().add(mlthread3);
+		
+		MailingListThread  mlthread4 = new MailingListThread();
+		HashSet<MailMessage> mlthread4set = new HashSet<MailMessage>();
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		ml.getThreads().add(mlthread4);
+		
+		Set<MailMessage> messages = ml.getMessages();
+		
+		assertEquals(20, messages.size());
+	}
+
+	@Test
+	public void testGetThreads() {
+		MailingList ml = new MailingList();
+		
+		ml.setThreads(new HashSet<MailingListThread>());
+		
+		MailingListThread  mlthread1 = new MailingListThread();
+		HashSet<MailMessage> mlthread1set = new HashSet<MailMessage>();
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		mlthread1set.add(new MailMessage());
+		ml.getThreads().add(mlthread1);
+		
+		MailingListThread  mlthread2 = new MailingListThread();
+		HashSet<MailMessage> mlthread2set = new HashSet<MailMessage>();
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		mlthread2set.add(new MailMessage());
+		ml.getThreads().add(mlthread2);
+		
+		
+		MailingListThread  mlthread3 = new MailingListThread();
+		HashSet<MailMessage> mlthread3set = new HashSet<MailMessage>();
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		mlthread3set.add(new MailMessage());
+		ml.getThreads().add(mlthread3);
+		
+		MailingListThread  mlthread4 = new MailingListThread();
+		HashSet<MailMessage> mlthread4set = new HashSet<MailMessage>();
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		mlthread4set.add(new MailMessage());
+		ml.getThreads().add(mlthread4);
+		
+		Set<MailingListThread> threads = ml.getThreads();
+		
+		assertEquals(4, threads.size());
+	}
+
+}
diff --git a/metrics/contrib/maven-eclipse.xml b/metrics/contrib/maven-eclipse.xml
new file mode 100644
index 000000000..9ff04ecea
--- /dev/null
+++ b/metrics/contrib/maven-eclipse.xml
@@ -0,0 +1,8 @@
+<project default="copy-resources">
+  <target name="init"/>
+  <target name="copy-resources" depends="init">
+    <copy todir="target/classes/eu/sqooss/service/db" filtering="false">
+      <fileset dir="src/main/java/eu/sqooss/metrics/contrib/db" includes="**/*.xml" excludes="**/*.java"/>
+    </copy>
+  </target>
+</project>
\ No newline at end of file
diff --git a/plug-ins/bugzilla/src/main/java/eu/sqooss/plugins/bugzilla/BugzillaXMLJob.java b/plug-ins/bugzilla/src/main/java/eu/sqooss/plugins/bugzilla/BugzillaXMLJob.java
index 56eecbd2f..e419f79b9 100644
--- a/plug-ins/bugzilla/src/main/java/eu/sqooss/plugins/bugzilla/BugzillaXMLJob.java
+++ b/plug-ins/bugzilla/src/main/java/eu/sqooss/plugins/bugzilla/BugzillaXMLJob.java
@@ -46,6 +46,7 @@
 import eu.sqooss.service.db.BugStatus;
 import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.db.Developer;
+import eu.sqooss.service.db.DeveloperDB;
 import eu.sqooss.service.db.StoredProject;
 import eu.sqooss.service.db.BugPriority.Priority;
 import eu.sqooss.service.db.BugResolution.Resolution;
@@ -188,9 +189,9 @@ private Bug BTSEntryToBug (BTSEntry b) {
     private Developer getDeveloper(String name) {
         Developer d = null;
         if (name.contains("@")) {
-            d = Developer.getDeveloperByEmail(name, project);
+            d = DeveloperDB.getDeveloperByEmail(name, project);
         } else {
-            d = Developer.getDeveloperByUsername(name, project);
+            d = DeveloperDB.getDeveloperByUsername(name, project);
         }
         return d;
     }
diff --git a/plug-ins/git/src/main/java/eu/sqooss/plugins/updater/git/GitUpdater.java b/plug-ins/git/src/main/java/eu/sqooss/plugins/updater/git/GitUpdater.java
index 00ad047e2..e71c81056 100644
--- a/plug-ins/git/src/main/java/eu/sqooss/plugins/updater/git/GitUpdater.java
+++ b/plug-ins/git/src/main/java/eu/sqooss/plugins/updater/git/GitUpdater.java
@@ -45,6 +45,7 @@
 import eu.sqooss.service.db.Branch;
 import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.db.Developer;
+import eu.sqooss.service.db.DeveloperDB;
 import eu.sqooss.service.db.Directory;
 import eu.sqooss.service.db.ProjectFile;
 import eu.sqooss.service.db.ProjectFileState;
@@ -324,7 +325,7 @@ public Developer getAuthor(StoredProject sp, String entryAuthor) {
         Developer d = null;
         
         if (email != null) {
-            d = Developer.getDeveloperByEmail(email, sp, true);
+            d = DeveloperDB.getDeveloperByEmail(email, sp, true);
             
             if (name != null) {
                 if (name.contains(" ")) {
@@ -335,9 +336,9 @@ public Developer getAuthor(StoredProject sp, String entryAuthor) {
             }
         } else {
             if (name.contains(" ")) {
-                d = Developer.getDeveloperByName(name, sp, true); 
+                d = DeveloperDB.getDeveloperByName(name, sp, true); 
             } else {
-                d = Developer.getDeveloperByUsername(name, sp, true);
+                d = DeveloperDB.getDeveloperByUsername(name, sp, true);
             }
         }
         return d;
diff --git a/plug-ins/git/src/test/java/eu/sqooss/plugins/git/test/TestGitUpdater.java b/plug-ins/git/src/test/java/eu/sqooss/plugins/git/test/TestGitUpdater.java
index c156b2c65..6c3e2a9db 100644
--- a/plug-ins/git/src/test/java/eu/sqooss/plugins/git/test/TestGitUpdater.java
+++ b/plug-ins/git/src/test/java/eu/sqooss/plugins/git/test/TestGitUpdater.java
@@ -31,6 +31,7 @@
 import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.db.Developer;
 import eu.sqooss.service.db.DeveloperAlias;
+import eu.sqooss.service.db.DeveloperDB;
 import eu.sqooss.service.db.ProjectFile;
 import eu.sqooss.service.db.ProjectFileState;
 import eu.sqooss.service.db.ProjectVersion;
@@ -126,7 +127,7 @@ public void testGetAuthor() {
         assertTrue(d.getAliases().contains(new DeveloperAlias("pm@smurfvillage.com", d)));
 
         //A bit of Developer DAO testing
-        assertNotNull(Developer.getDeveloperByEmail("pm@smurfvillage.com", sp));
+        assertNotNull(DeveloperDB.getDeveloperByEmail("pm@smurfvillage.com", sp));
         d.addAlias("pm@smurfvillage.com");
         assertEquals(1, d.getAliases().size());
         
diff --git a/plug-ins/maildir/src/main/java/eu/sqooss/plugins/maildir/MailMessageJob.java b/plug-ins/maildir/src/main/java/eu/sqooss/plugins/maildir/MailMessageJob.java
index 11af8e2fc..9349fb7c8 100644
--- a/plug-ins/maildir/src/main/java/eu/sqooss/plugins/maildir/MailMessageJob.java
+++ b/plug-ins/maildir/src/main/java/eu/sqooss/plugins/maildir/MailMessageJob.java
@@ -43,6 +43,7 @@
 import eu.sqooss.core.AlitheiaCore;
 import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.db.Developer;
+import eu.sqooss.service.db.DeveloperDB;
 import eu.sqooss.service.db.MailMessage;
 import eu.sqooss.service.db.MailingList;
 import eu.sqooss.service.db.StoredProject;
@@ -127,7 +128,7 @@ protected void run() throws Exception {
 
         // Try to find developer from name first
         if (devName != null) {
-            sender = Developer.getDeveloperByName(devName,
+            sender = DeveloperDB.getDeveloperByName(devName,
                     ml.getStoredProject(), false);
         }
 
@@ -140,7 +141,7 @@ protected void run() throws Exception {
                 return;
             }
 
-            sender = Developer.getDeveloperByEmail(senderEmail,
+            sender = DeveloperDB.getDeveloperByEmail(senderEmail,
                     ml.getStoredProject(), true);
 
             // Found dev by email, but not by name
diff --git a/plug-ins/svn/src/main/java/eu/sqooss/plugins/updater/svn/SVNUpdaterImpl.java b/plug-ins/svn/src/main/java/eu/sqooss/plugins/updater/svn/SVNUpdaterImpl.java
index 32e1a05a5..65c3237f9 100644
--- a/plug-ins/svn/src/main/java/eu/sqooss/plugins/updater/svn/SVNUpdaterImpl.java
+++ b/plug-ins/svn/src/main/java/eu/sqooss/plugins/updater/svn/SVNUpdaterImpl.java
@@ -45,6 +45,7 @@
 import eu.sqooss.service.db.Branch;
 import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.db.Developer;
+import eu.sqooss.service.db.DeveloperDB;
 import eu.sqooss.service.db.Directory;
 import eu.sqooss.service.db.ProjectFile;
 import eu.sqooss.service.db.ProjectFileState;
@@ -201,7 +202,7 @@ public void update() throws Exception {
             } else {
                 //Add revision 0 and / (root) file entry
                 ProjectVersion zero = new ProjectVersion(project);
-                zero.setCommitter(Developer.getDeveloperByUsername("sqo-oss", project));
+                zero.setCommitter(DeveloperDB.getDeveloperByUsername("sqo-oss", project));
                 zero.setTimestamp(scm.getFirstRevision().getDate().getTime());
                 zero.setCommitMsg("Artificial revision to include / directory");
                 zero.setRevisionId("0");
@@ -376,7 +377,7 @@ private ProjectVersion processCommit(SCMAccessor scm, Revision entry) {
         curVersion.setRevisionId(entry.getUniqueId());
         curVersion.setTimestamp(entry.getDate().getTime());
 
-        Developer d  = Developer.getDeveloperByUsername(entry.getAuthor(), project);
+        Developer d  = DeveloperDB.getDeveloperByUsername(entry.getAuthor(), project);
        
         curVersion.setCommitter(d);
 
diff --git a/pom.xml b/pom.xml
index 12683f1ee..54061c107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,24 +49,25 @@
     <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
 
     <!-- MySQL and HSQLDB supported out of the box. Uncomment one of the sections below -->
-    <!-- MySQL 
+    <!-- MySQL -->
     <eu.sqooss.db>MySQL</eu.sqooss.db>
     <eu.sqooss.db.host>localhost</eu.sqooss.db.host>
     <eu.sqooss.db.schema>alitheia</eu.sqooss.db.schema>
     <eu.sqooss.db.user>alitheia</eu.sqooss.db.user>
     <eu.sqooss.db.passwd>alitheia</eu.sqooss.db.passwd>
     <eu.sqooss.db.conpool>c3p0</eu.sqooss.db.conpool>
-    -->   
     
+<!--H2
     <eu.sqooss.db>H2</eu.sqooss.db>
     <eu.sqooss.db.host>localhost</eu.sqooss.db.host>
     <eu.sqooss.db.schema>alitheia;LOCK_MODE=3;MULTI_THREADED=true</eu.sqooss.db.schema>
     <eu.sqooss.db.user>sa</eu.sqooss.db.user>
     <eu.sqooss.db.passwd></eu.sqooss.db.passwd>
     <eu.sqooss.db.conpool>c3p0</eu.sqooss.db.conpool>
+    -->
     <eu.sqooss.updater.svn.ommitfileless>true</eu.sqooss.updater.svn.ommitfileless>
     <eu.sqooss.updater.svn.handlecopies>branches</eu.sqooss.updater.svn.handlecopies>
-    
+
     <!-- If fast, only one randomly chosen metric per plug-in will be queried
     to determine whether recalculation is necessary. Slow is safer, but, well, slower-->
     <eu.sqooss.metricactivator.sync>slow</eu.sqooss.metricactivator.sync>