DI refactoring, input format changed