XAdded some command line support