Added message standardisation