Modify MessageTable to include Type column