Added message formatting