Improved dataset handling.