CLI script adjustments