Enhance table context