Add support for querystrings