Updated predefined scopes to use defined scopes instead of reflection