Updated some DataManger functions