Adding extra logging