Add validations to messages