Added support for basic query params