table model improvement