Switched to Spring Data Jpa API