Add new Api for client and server