MARI-69 updated to use literals from messages