Improve lifecycle consistency