Added support for class methods