add support for custom collections and query operators