Improvement: Amazon attribute builder upgrade