Updated for the new log layout