Added more information to output