Add additional debug logging