Updated Swig binding