Add jpa queries, update object case