- add support for server mode
