Added message id to the mapper