* Improved logging functionality