Added swig support