WIP Add message type to failure resolved event

Related to #336