Added JPA layer