code level enhancement to the CLI