Added multiple field replacement