Add full support for coherence messages