Replace methods from Dataset class to CLI module