Streamlines the datas Handlers and other minor things