added Id for message entity