Make ids implicit, change Dataset function names