removed DataHandler again (got back with merging with master)