#112 dataHandler support