Refactored DefaultTable