Amazon, use concurrency safe enhance_referent