Added some more life cycle stuff.