On the way to a more structured CLI