Migrated to Eclipse-link instead of Hibernate