Adding hydrate method in manager
Merge branch '1.1'