Switch to namevaluepair