Improved lifecycle behaviour