diff --git a/build.sbt b/build.sbt
index 291be48..596cf46 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,10 +15,12 @@ libraryDependencies += "javax" % "javaee-api" % "7.0" % "provided"
 
 libraryDependencies += "junit" % "junit" % "4.12" % "test"
 libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
-libraryDependencies += "com.thoughtworks.xstream" % "xstream" % "1.4.10"
+libraryDependencies += "com.thoughtworks.xstream" % "xstream" % "1.4.10" % "test"
 libraryDependencies += "commons-io" % "commons-io" % "2.5" % "test"
 libraryDependencies += "org.jboss" % "jboss-ejb-client" % "4.0.0.CR5" % "test"
+//libraryDependencies += "org.hibernate.javax.persistence" % "hibernate-jpa-2.0-api" % "1.0.1.Final"
 
+libraryDependencies += "org.hibernate" % "hibernate-jpamodelgen" % "5.2.10.Final" % "provided"
 
 //libraryDependencies += "org.jboss.resteasy" % "resteasy-jaxrs" % "3.1.3.Final" % "test"
 //libraryDependencies += "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final"
diff --git a/src/main/java/com/oggio88/jpacrepo/model/PkgData_.java b/src/main/java/com/oggio88/jpacrepo/model/PkgData_.java
deleted file mode 100644
index aede303..0000000
--- a/src/main/java/com/oggio88/jpacrepo/model/PkgData_.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.oggio88.jpacrepo.model;
-
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
-@StaticMetamodel(PkgData.class)
-public abstract class PkgData_ {
-
-	public static volatile SingularAttribute<PkgData, String> fileName;
-	public static volatile ListAttribute<PkgData, String> backup;
-	public static volatile ListAttribute<PkgData, String> makeopkgopt;
-	public static volatile ListAttribute<PkgData, String> depend;
-	public static volatile ListAttribute<PkgData, String> replaces;
-	public static volatile SingularAttribute<PkgData, Date> updTimestamp;
-	public static volatile SingularAttribute<PkgData, String> description;
-	public static volatile SingularAttribute<PkgData, Date> buildDate;
-	public static volatile SingularAttribute<PkgData, String> version;
-	public static volatile SingularAttribute<PkgData, String> packager;
-	public static volatile SingularAttribute<PkgData, String> url;
-	public static volatile SingularAttribute<PkgData, String> license;
-	public static volatile SingularAttribute<PkgData, Long> size;
-	public static volatile ListAttribute<PkgData, String> makedepend;
-	public static volatile ListAttribute<PkgData, String> optdepend;
-	public static volatile SingularAttribute<PkgData, String> md5sum;
-	public static volatile ListAttribute<PkgData, String> provides;
-	public static volatile SingularAttribute<PkgData, PkgName> name;
-	public static volatile SingularAttribute<PkgData, Integer> id;
-	public static volatile SingularAttribute<PkgData, String> arch;
-	public static volatile SingularAttribute<PkgData, String> base;
-	public static volatile ListAttribute<PkgData, String> conflict;
-
-}
-
diff --git a/src/main/java/com/oggio88/jpacrepo/model/PkgName_.java b/src/main/java/com/oggio88/jpacrepo/model/PkgName_.java
deleted file mode 100644
index b2dd62a..0000000
--- a/src/main/java/com/oggio88/jpacrepo/model/PkgName_.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.oggio88.jpacrepo.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
-@StaticMetamodel(PkgName.class)
-public abstract class PkgName_ {
-
-	public static volatile SingularAttribute<PkgName, String> id;
-
-}
-
diff --git a/src/test/java/ClientTest.java b/src/test/java/ClientTest.java
index f549393..6ff276d 100644
--- a/src/test/java/ClientTest.java
+++ b/src/test/java/ClientTest.java
@@ -21,6 +21,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
+import java.util.List;
 import java.util.Properties;
 
 /**
@@ -132,7 +133,7 @@ public class ClientTest
 
         prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
 //        prop.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-        prop.put(Context.PROVIDER_URL, "http-remoting://odroid-u3:8080");
+        prop.put(Context.PROVIDER_URL, "http-remoting://odroid-xu4:8080");
 //        prop.put(Context.PROVIDER_URL, "remote://odroid-u3:4447");
         prop.put(Context.SECURITY_PRINCIPAL, "jpacrepo");
         prop.put(Context.SECURITY_CREDENTIALS, "password01.");
@@ -141,8 +142,9 @@ public class ClientTest
         Context ctx = new InitialContext(prop);
         traverseJndiNode("/", context);
 //        final PacmanService stateService = (PacmanService) ctx.lookup("/jpacrepo-1.0/remote/PacmanServiceEJB!service.PacmanService");
-        final PacmanServiceView stateService = (PacmanServiceView) ctx.lookup("/jpacrepo/PacmanServiceEJB!org.jpacrepo.service.PacmanService");
-        stateService.deletePackage("google-earth-7.1.4.1529-1-x86_64.pkg.tar.xz");
+        final PacmanServiceView service = (PacmanServiceView) ctx.lookup("/jpacrepo/PacmanServiceEJB!org.jpacrepo.service.PacmanService");
+        List<PkgData> pkgs = service.searchPackage("google-earth", null, null, 1, 10);
+        System.out.println(new XStream().toXML(pkgs));
     }
 
 }