Improved server mode to register all of