Add support for single-object queries