Improve debug table