Updated DataManager