Some work on DataManager & Controller