CLI fix and message interpreter placeholder