Updates for DataManager