Added support for deletion and visibility changes