TypeConfigurator almost done