Changed orderedAttributes to attributesOrder to avoid duplicate data with attributesMap