Swig updates for swaps