Better command line capabilities