Added some hints to JPA mapping