Added support for a replacement wrapper.