Add ability to enumerate dataset