added class method support