Added class constant use for 5.5+