Adding better logging for eoc