Tightening the Amazon provider