Add query param support