Message validation added