Added Swig and Consolidate