Upgraded scopes to new convention