Adding @QueryParams support