CLI architecture in place