Added lifecycle support