Added support for class constants