Added support for ampersand replacements