Fix message Table defination