Update for new chat format