Shouldn't the hydrator be a service on its own?