Dependency injection reliability and speed improved