This should be renamed. It's not creating the subject map, but actually adding the subject map and removing the other fields.