Add path variable %WorkDir%, some optimization.