Refactor Hibernate Eager Loading