- Improved logging