Added RegExp to replace Affix