Added functionality to DataHandler