Update to custom messages