Removed dependency on an Entity model and refactored for a simpler repository implementation.