Adding support for fetching a single dataset