moved constants to the Constant obj