Adding better logging of information