Add support for single record retrieval