C: Added some data set handling