Updated to support Rugged Com vendor.