Updated for current logging mechanism.