Some Scopes optimisations