Added extra logging