Modified DataHandler. Working, not properly tested