Added resolved/unresolved scopes