Adjust CLI code