Improved swig wrappers (callbacks)