Changed way output data set is created.