new service locator, removed k types and collections