Add AddressHydrator and ContactHydrator