Added more logging messages