Added mechanism for specifying template messages as %MESSAGES