Rework messages to tree nodes