Improved dataset API w/ @trumanc