Explicitly add headers for external types and values