Made changes to datahandler
Merged