Changes and additions for command line execution.