Update to use array for scopes