Add support for class member variable