One more todo.
hydrateProperty became a private _hydrateProperty.