Adding some extra logging