Add CDI Chat Support