Added additional debug logging