Client/Server API updated