Updated message functionality