Move to swig templates 2