Refactored data storage