Include attribute choices in generated output