Added support for messages in cli input. Forgot to add this initially.