Added support for scopes
Forgot to add these