Improve command line API