Added message scaffold