Added DI definition + generator