Added more comprehensive logs