Refactored data storage in Table