added class constant support