Updated CLI tools with correct usage