Fixed table and added Swig