Add better debug output