updates for type expansion