Some refactoring
Moved all TODOs to DataManager class