Implemented changes in API

Also fixed NPE with CanaryDamageSource in Explosion.