Divide funcitonality between fetch and join mapping strategies
Refactoring for fetching