Refactored message creation in prep for introducing unit of work context