Improve parseCommandTable