#16 Replace validatorId in MessageTemplate with a real reference