Update to new lifecycle system.