Initial support for querying as a baseline