improved handling of +class method