Changing import, adding getDatasets method and solving bugs