Lifecycle improvements