Add Lifecycle Event Support