Make the chat API work a bit differently