Updated server handling