Merge with Server and Router Configurator