Added MultiServer support