Add command line support