Adding back required values for logging...