Added more logging features