Refactor hydrate