Added uri querystring parsing