Better error handling and improved performance.