Updated the structure and condition used for logging.