Added swig into the mix