Add configurable hydrator strategies
Created hydrator service for collections
Fix conflict