Support better command line syntax