Updated CLI library