Added lifecycle methods