Added additional printing for CLI.