Make MessageHeaders non-final