Refactored data structures