Support additional args to query