Add support for including attribute values in the output.