added $env.XXX and $const.YYY to resolver