Refactor CustomRepository by separating functionality into subclasses
Refactor CustomRepository by separating functionality into subclasses