started adding multi-dataset support