Moved some constants to Constant class.