Added datahandler methods