I went down the road of wrapping, but is there an easier way perhaps?

thanks to your screenshot i know now where to look in the skywater pdk tree for the stdcells spice models :-)

No worries @Stefan Schippers, glad it helps :)

@jrsharp in latest commit to xschem_sky130 i have added 2 more supply terminals (set via attributes) to all standard cell symbols to customize body connections (both n and pwell), the order is VCC VSS VCCBODY VSSBODY, so your .subckt wrapper should be something like: .subckt AND2 y a b vdd vss vddb vssb ..... .ends Xschem file format is simple so it was a matter of issuing 4 'sed -i ...' commands to do the change on the whole library.

@Stefan Schippers great, thanks