Added in support for scopes