DataManager Changes