Added a query string parser