Switched to use Spring CrudRepository