Fixed DataManager