DI fixes and features integration