Change to allow the configuration of hydrator generation