#61: Finished changes at DataManager.