Refactored message creation to not use message builder