Add DeathEffects framework, refactoring