Added DataHandler class