Updated the APIs, ready to deploy in production