Refactored DataContainer and DataManager