Made the message consumer general and moved it to core.