- Improved error handling
- Added fuzzy matching strategy