Updated server API