Added new scopes. Needs revision.