Made datasets a bit more flexible