Migrate EVConstant to EVCommon