One last thing for the refactoring, renaming of cmds->subcmds