Added collection and class queries