Add support for removal in the app