Updates to lifecycle, reflecting current expectations