Improve the unit of work when handling a message;