Convert type on data loading.
Update TODO