Added scopes and categories