Added class queries