Made it also work with Hibernate now