Maintain ordering when adding dynamic fields