Added replacement behavior