Rewrote Messages as a mixin