Added message making and validation