Added support for swig-extras and swig-extensions