Intermediate changes ( trying to get JPA working )