Added support for object schema passed to extend