Improved api table directive #34