Adjustments to chat provider to generate different classes