Modify DataHandler and DataParser