Updated swig wrappers