Added variables and overwrite support