Adding more stuff to the swig wrapper...