added "with" and "without" scopes