Add Scopes Support