Refactored action message construction