Added class constant support