Add variables on path
Correct bug of *.xx
Improve command