Add deferred loading of extractors