Initial work for Hibernate (v4 onwards)