Added support for lazy loaded extending