Adding Chat features