moved the properties from separate variables into a single map<string,string>