Adapted existing replacers to new syntax