Refactored repositories