Add extra logging