Implement more of hydrate