Added JPA funcionality