[NEW] Arch Refactoring Stage 4: Data Structure