Added variables mapping