Add basic suport for replies