Add support for converting query params