Fixed some things wih DataHandler