created UpgradeUtil class; moved mapping function