added scopes and decorators