Update for newest lifecycle changes.