added some new variable mapping and modified path