Improve command line behavior