Change for CommonConstant