add override message id logic