Add more debug logging