Refactor & start of Hibernate annotations