Added a bit more verbose logging