Updated chat handling