Simplified the DataHandler stuff