Added better logging messages