DI updated with scopes and more