Added the ability for query string options