improve command argument support