(fix) Use new Server function