feat: Improved logging