Added more loggings