Add support for removal