Merging s number of small includes into one
Adding dataset support