Refactor datahandlers & add 1-1 parse objects