Added better logging information