[Fix] Refactoring - DataManger not CommManager