Hibernate mapping relations fixed