Otmessage refactor part3

continue #303