Worked on the datahandler class