Modify to add NameValuePair