DI, small fixes with loaders for next changes.