Improve Lifecycle Support