Add safe-checking
Add support for specifying removal animation and duration