added more text fields to attribute mapping, removed unit fields
mapping for excluding an attribute set right