Add support to fetch a single record