DataManager, package refactoring fix