Add support for _removed