Refactor hydration