Put all used messages into seperate node, change source to get things compiling again