Add comments to CommandManager