Improve command table [ci skip]