Use new format for the attributes