Fixed undefined variables in attribute maps
Merge branch 'Fixed_attribute_maps'