More work on the cli syntax