Added Lifecycle support