Updated CLI app