Feature/multiple scopes