Finished new server API