Add more verbose logging