Use new query params implementation