Add options to have custom messages reporting