Adding Message responsibility

[skip ci]