Revert data repository to CrudRepository for now