Upgrade component sorting