Better implementation of the option "server"