DataManager and Freddie refactoring