Updated server skeleton