Major refactoring
DataManager cleanup & Context