Otmessage refactor part2

continue #299