Add configuration for the CLI app.
Perform fixes to integrate configuration into the CLI app.