Updated Query model to support future query types