Some enhancement for logging