DataManager fixes + updates tracking