ChatApplication: Changes made. Need to review