Added command line support