Added some more information to logging