Added make_attribute_dict()
Minor edits