Added more logging and more reporter