Fixed dependency scopes