Add attribute enums.  Replace fields with map of attributes.