Yes, Garmin will still support the discontinued units with the WAAS upgrade; however, units without the upgrade will not be supported.