Much more usable table handling