Removed usage of DataSet from utils dataunit