Replacing attribute_map with attribut_list for new API