Aligning with Hibernate4