[WIP] Add type hydrators