Log message generation improved