Hydrator refactoring