Changed all of the type attribtues to attr_type