First step te remove service lookups in Introspect class