Overengineeeering.

DI tool done, but it may be incorrect.
Method invocation removed from templates.