Attribute map

Replaced the hardcoded property members with a map of attributes (paired
strings)