(COMMIT-36) Additional JPA configuration and implementation