Adding multiple types of dataset.
Merge branch 'dataset-types'
Added suport for non-categorical datasets.