diff --git a/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java b/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java
index 4da5794aa746f686f6f60c18ff83b11233949751..08c299505058ca93c264366e9e0c7661ca59f8f5 100644
--- a/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java
+++ b/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java
@@ -1,7 +1,8 @@
 package org.universAAL.ucc.database.parser;
 
 import org.universAAL.middleware.deploymanager.uapp.model.AalUapp;
-import org.universAAL.ucc.model.usrv_old.AalUsrv;
+//import org.universAAL.ucc.model.usrv_old.AalUsrv;
+import org.universAAL.ucc.model.usrv.AalUsrv;
 
 /**
  * ParserService for getting a UAPP or USRV Java Instance.
diff --git a/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java b/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java
index d3b628b1e0b231912c4f24f9bd52fa54a4614c99..9e74a7d2fa24b15111ee19d2c4b7d2372c3111db 100644
--- a/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java
+++ b/uCC/ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java
@@ -8,7 +8,8 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
 import org.universAAL.middleware.deploymanager.uapp.model.AalUapp;
-import org.universAAL.ucc.model.usrv_old.AalUsrv;
+//import org.universAAL.ucc.model.usrv_old.AalUsrv;
+import org.universAAL.ucc.model.usrv.AalUsrv;
 
 public class ParserServiceImpl implements ParserService {