Upgrade to allow 50,000 unique names