Switched to JpaRepository