Added support for custom lifecycles