Refers #214 -- Improved table handling