Refactored tables