Updated CLI commands