BON-9 : Changes to allow use of JPA