Hibernate additions. Still very broken!