CAS-1248: Cleaned up the way attributes were collected into the hashmap.