Made some message immutable