Refactored Hydrator components