Feature/refine chat