Improved performance, Added error handling and notifications
- Added error handling and notifications