Add support for replacement