Update key format to include request headers