Add better integration for chat