Updated to work with latest dataconverters