Added support for command line server.