This now uses the base type.