Change thing scopes to class methods