Refactored table