Added message validation