Upgrade custom field generation