Improved logging mechanism