Added CAttributeType and CAttribute to better gather attribute information