Updated server to match docs