Improved exception handling, introduced ownership