Fix: Change to lifecycle Events