Add Count() and CountDistinct() to query types