diff --git a/scripts/java/OBAtomBondIter.java b/scripts/java/OBAtomBondIter.java
index 02bfabbc7..8bafe1860 100644
--- a/scripts/java/OBAtomBondIter.java
+++ b/scripts/java/OBAtomBondIter.java
@@ -221,7 +221,7 @@ public class OBAtomBondIter {
     return openbabelJNI.OBAtomBondIter_GetLength(swigCPtr, this);
   }
 
-  public int GetNbrAtomIdx(OBAtom ptr) {
+  public long GetNbrAtomIdx(OBAtom ptr) {
     return openbabelJNI.OBAtomBondIter_GetNbrAtomIdx(swigCPtr, this, OBAtom.getCPtr(ptr), ptr);
   }
 
diff --git a/scripts/java/OBBond.java b/scripts/java/OBBond.java
index 5990d5b73..b6989821c 100644
--- a/scripts/java/OBBond.java
+++ b/scripts/java/OBBond.java
@@ -192,7 +192,7 @@ public class OBBond extends OBBase {
     return openbabelJNI.OBBond_GetLength(swigCPtr, this);
   }
 
-  public int GetNbrAtomIdx(OBAtom ptr) {
+  public long GetNbrAtomIdx(OBAtom ptr) {
     return openbabelJNI.OBBond_GetNbrAtomIdx(swigCPtr, this, OBAtom.getCPtr(ptr), ptr);
   }
 
diff --git a/scripts/java/OBMol.java b/scripts/java/OBMol.java
index 832b64e3d..62d2382e6 100644
--- a/scripts/java/OBMol.java
+++ b/scripts/java/OBMol.java
@@ -178,8 +178,8 @@ public class OBMol extends OBBase {
     return openbabelJNI.OBMol_NumRotors(swigCPtr, this);
   }
 
-  public OBAtom GetAtom(int arg0) {
-    long cPtr = openbabelJNI.OBMol_GetAtom(swigCPtr, this, arg0);
+  public OBAtom GetAtom(int idx) {
+    long cPtr = openbabelJNI.OBMol_GetAtom(swigCPtr, this, idx);
     return (cPtr == 0) ? null : new OBAtom(cPtr, false);
   }
 
@@ -188,13 +188,13 @@ public class OBMol extends OBBase {
     return (cPtr == 0) ? null : new OBAtom(cPtr, false);
   }
 
-  public OBBond GetBond(int arg0) {
-    long cPtr = openbabelJNI.OBMol_GetBond__SWIG_0(swigCPtr, this, arg0);
+  public OBBond GetBond(int idx) {
+    long cPtr = openbabelJNI.OBMol_GetBond__SWIG_0(swigCPtr, this, idx);
     return (cPtr == 0) ? null : new OBBond(cPtr, false);
   }
 
-  public OBBond GetBond(int arg0, int arg1) {
-    long cPtr = openbabelJNI.OBMol_GetBond__SWIG_1(swigCPtr, this, arg0, arg1);
+  public OBBond GetBond(int a, int b) {
+    long cPtr = openbabelJNI.OBMol_GetBond__SWIG_1(swigCPtr, this, a, b);
     return (cPtr == 0) ? null : new OBBond(cPtr, false);
   }
 
diff --git a/scripts/java/OBMolBondIter.java b/scripts/java/OBMolBondIter.java
index edfce979e..1de761c82 100644
--- a/scripts/java/OBMolBondIter.java
+++ b/scripts/java/OBMolBondIter.java
@@ -221,7 +221,7 @@ public class OBMolBondIter {
     return openbabelJNI.OBMolBondIter_GetLength(swigCPtr, this);
   }
 
-  public int GetNbrAtomIdx(OBAtom ptr) {
+  public long GetNbrAtomIdx(OBAtom ptr) {
     return openbabelJNI.OBMolBondIter_GetNbrAtomIdx(swigCPtr, this, OBAtom.getCPtr(ptr), ptr);
   }
 
diff --git a/scripts/java/openbabel.java b/scripts/java/openbabel.java
index 6e4247552..508049731 100644
--- a/scripts/java/openbabel.java
+++ b/scripts/java/openbabel.java
@@ -32,6 +32,10 @@ public class openbabel implements openbabelConstants {
     return openbabelJNI.Point2Plane(vector3.getCPtr(a), a, vector3.getCPtr(b), b, vector3.getCPtr(c), c, vector3.getCPtr(d), d);
   }
 
+  public static double Point2PlaneAngle(vector3 a, vector3 b, vector3 c, vector3 d) {
+    return openbabelJNI.Point2PlaneAngle(vector3.getCPtr(a), a, vector3.getCPtr(b), b, vector3.getCPtr(c), c, vector3.getCPtr(d), d);
+  }
+
   public static vector3 getVZero() {
     return new vector3(openbabelJNI.VZero_get(), false);
   }
@@ -52,166 +56,6 @@ public class openbabel implements openbabelConstants {
     return new SWIGTYPE_p_std__string(openbabelJNI.Trim(SWIGTYPE_p_std__string.getCPtr(txt)), false);
   }
 
-  public static long getUndefinedData() {
-    return openbabelJNI.UndefinedData_get();
-  }
-
-  public static long getPairData() {
-    return openbabelJNI.PairData_get();
-  }
-
-  public static long getEnergyData() {
-    return openbabelJNI.EnergyData_get();
-  }
-
-  public static long getCommentData() {
-    return openbabelJNI.CommentData_get();
-  }
-
-  public static long getConformerData() {
-    return openbabelJNI.ConformerData_get();
-  }
-
-  public static long getExternalBondData() {
-    return openbabelJNI.ExternalBondData_get();
-  }
-
-  public static long getRotamerList() {
-    return openbabelJNI.RotamerList_get();
-  }
-
-  public static long getVirtualBondData() {
-    return openbabelJNI.VirtualBondData_get();
-  }
-
-  public static long getRingData() {
-    return openbabelJNI.RingData_get();
-  }
-
-  public static long getTorsionData() {
-    return openbabelJNI.TorsionData_get();
-  }
-
-  public static long getAngleData() {
-    return openbabelJNI.AngleData_get();
-  }
-
-  public static long getSerialNums() {
-    return openbabelJNI.SerialNums_get();
-  }
-
-  public static long getUnitCell() {
-    return openbabelJNI.UnitCell_get();
-  }
-
-  public static long getSpinData() {
-    return openbabelJNI.SpinData_get();
-  }
-
-  public static long getChargeData() {
-    return openbabelJNI.ChargeData_get();
-  }
-
-  public static long getSymmetryData() {
-    return openbabelJNI.SymmetryData_get();
-  }
-
-  public static long getChiralData() {
-    return openbabelJNI.ChiralData_get();
-  }
-
-  public static long getOccupationData() {
-    return openbabelJNI.OccupationData_get();
-  }
-
-  public static long getDensityData() {
-    return openbabelJNI.DensityData_get();
-  }
-
-  public static long getElectronicData() {
-    return openbabelJNI.ElectronicData_get();
-  }
-
-  public static long getVibrationData() {
-    return openbabelJNI.VibrationData_get();
-  }
-
-  public static long getRotationData() {
-    return openbabelJNI.RotationData_get();
-  }
-
-  public static long getNuclearData() {
-    return openbabelJNI.NuclearData_get();
-  }
-
-  public static long getSetData() {
-    return openbabelJNI.SetData_get();
-  }
-
-  public static long getCustomData0() {
-    return openbabelJNI.CustomData0_get();
-  }
-
-  public static long getCustomData1() {
-    return openbabelJNI.CustomData1_get();
-  }
-
-  public static long getCustomData2() {
-    return openbabelJNI.CustomData2_get();
-  }
-
-  public static long getCustomData3() {
-    return openbabelJNI.CustomData3_get();
-  }
-
-  public static long getCustomData4() {
-    return openbabelJNI.CustomData4_get();
-  }
-
-  public static long getCustomData5() {
-    return openbabelJNI.CustomData5_get();
-  }
-
-  public static long getCustomData6() {
-    return openbabelJNI.CustomData6_get();
-  }
-
-  public static long getCustomData7() {
-    return openbabelJNI.CustomData7_get();
-  }
-
-  public static long getCustomData8() {
-    return openbabelJNI.CustomData8_get();
-  }
-
-  public static long getCustomData9() {
-    return openbabelJNI.CustomData9_get();
-  }
-
-  public static long getCustomData10() {
-    return openbabelJNI.CustomData10_get();
-  }
-
-  public static long getCustomData11() {
-    return openbabelJNI.CustomData11_get();
-  }
-
-  public static long getCustomData12() {
-    return openbabelJNI.CustomData12_get();
-  }
-
-  public static long getCustomData13() {
-    return openbabelJNI.CustomData13_get();
-  }
-
-  public static long getCustomData14() {
-    return openbabelJNI.CustomData14_get();
-  }
-
-  public static long getCustomData15() {
-    return openbabelJNI.CustomData15_get();
-  }
-
   public static void setObErrorLog(OBMessageHandler value) {
     openbabelJNI.obErrorLog_set(OBMessageHandler.getCPtr(value), value);
   }
@@ -220,370 +64,6 @@ public class openbabel implements openbabelConstants {
     return new OBMessageHandler(openbabelJNI.obErrorLog_get(), false);
   }
 
-  public static long getACIDIC() {
-    return openbabelJNI.ACIDIC_get();
-  }
-
-  public static long getACYCLIC() {
-    return openbabelJNI.ACYCLIC_get();
-  }
-
-  public static long getALIPHATIC() {
-    return openbabelJNI.ALIPHATIC_get();
-  }
-
-  public static long getAROMATIC() {
-    return openbabelJNI.AROMATIC_get();
-  }
-
-  public static long getBASIC() {
-    return openbabelJNI.BASIC_get();
-  }
-
-  public static long getBURIED() {
-    return openbabelJNI.BURIED_get();
-  }
-
-  public static long getCHARGED() {
-    return openbabelJNI.CHARGED_get();
-  }
-
-  public static long getCYCLIC() {
-    return openbabelJNI.CYCLIC_get();
-  }
-
-  public static long getHYDROPHOBIC() {
-    return openbabelJNI.HYDROPHOBIC_get();
-  }
-
-  public static long getLARGE() {
-    return openbabelJNI.LARGE_get();
-  }
-
-  public static long getMEDIUM() {
-    return openbabelJNI.MEDIUM_get();
-  }
-
-  public static long getNEGATIVE() {
-    return openbabelJNI.NEGATIVE_get();
-  }
-
-  public static long getNEUTRAL() {
-    return openbabelJNI.NEUTRAL_get();
-  }
-
-  public static long getPOLAR() {
-    return openbabelJNI.POLAR_get();
-  }
-
-  public static long getPOSITIVE() {
-    return openbabelJNI.POSITIVE_get();
-  }
-
-  public static long getSMALL() {
-    return openbabelJNI.SMALL_get();
-  }
-
-  public static long getSURFACE() {
-    return openbabelJNI.SURFACE_get();
-  }
-
-  public static long getALPHA_CARBON() {
-    return openbabelJNI.ALPHA_CARBON_get();
-  }
-
-  public static long getAMINO_BACKBONE() {
-    return openbabelJNI.AMINO_BACKBONE_get();
-  }
-
-  public static long getBACKBONE() {
-    return openbabelJNI.BACKBONE_get();
-  }
-
-  public static long getCYSTEINE_SULPHUR() {
-    return openbabelJNI.CYSTEINE_SULPHUR_get();
-  }
-
-  public static long getLIGAND() {
-    return openbabelJNI.LIGAND_get();
-  }
-
-  public static long getNUCLEIC_BACKBONE() {
-    return openbabelJNI.NUCLEIC_BACKBONE_get();
-  }
-
-  public static long getSHAPELY_BACKBONE() {
-    return openbabelJNI.SHAPELY_BACKBONE_get();
-  }
-
-  public static long getSHAPELY_SPECIAL() {
-    return openbabelJNI.SHAPELY_SPECIAL_get();
-  }
-
-  public static long getSIDECHAIN() {
-    return openbabelJNI.SIDECHAIN_get();
-  }
-
-  public static long getSUGAR_PHOSPHATE() {
-    return openbabelJNI.SUGAR_PHOSPHATE_get();
-  }
-
-  public static long getALA() {
-    return openbabelJNI.ALA_get();
-  }
-
-  public static long getGLY() {
-    return openbabelJNI.GLY_get();
-  }
-
-  public static long getLEU() {
-    return openbabelJNI.LEU_get();
-  }
-
-  public static long getSER() {
-    return openbabelJNI.SER_get();
-  }
-
-  public static long getVAL() {
-    return openbabelJNI.VAL_get();
-  }
-
-  public static long getTHR() {
-    return openbabelJNI.THR_get();
-  }
-
-  public static long getLYS() {
-    return openbabelJNI.LYS_get();
-  }
-
-  public static long getASP() {
-    return openbabelJNI.ASP_get();
-  }
-
-  public static long getILE() {
-    return openbabelJNI.ILE_get();
-  }
-
-  public static long getASN() {
-    return openbabelJNI.ASN_get();
-  }
-
-  public static long getGLU() {
-    return openbabelJNI.GLU_get();
-  }
-
-  public static long getPRO() {
-    return openbabelJNI.PRO_get();
-  }
-
-  public static long getARG() {
-    return openbabelJNI.ARG_get();
-  }
-
-  public static long getPHE() {
-    return openbabelJNI.PHE_get();
-  }
-
-  public static long getGLN() {
-    return openbabelJNI.GLN_get();
-  }
-
-  public static long getTYR() {
-    return openbabelJNI.TYR_get();
-  }
-
-  public static long getHIS() {
-    return openbabelJNI.HIS_get();
-  }
-
-  public static long getCYS() {
-    return openbabelJNI.CYS_get();
-  }
-
-  public static long getMET() {
-    return openbabelJNI.MET_get();
-  }
-
-  public static long getTRP() {
-    return openbabelJNI.TRP_get();
-  }
-
-  public static long getASX() {
-    return openbabelJNI.ASX_get();
-  }
-
-  public static long getGLX() {
-    return openbabelJNI.GLX_get();
-  }
-
-  public static long getPCA() {
-    return openbabelJNI.PCA_get();
-  }
-
-  public static long getHYP() {
-    return openbabelJNI.HYP_get();
-  }
-
-  public static long getA() {
-    return openbabelJNI.A_get();
-  }
-
-  public static long getC() {
-    return openbabelJNI.C_get();
-  }
-
-  public static long getG() {
-    return openbabelJNI.G_get();
-  }
-
-  public static long getT() {
-    return openbabelJNI.T_get();
-  }
-
-  public static long getU() {
-    return openbabelJNI.U_get();
-  }
-
-  public static long getUPLUS() {
-    return openbabelJNI.UPLUS_get();
-  }
-
-  public static long getI() {
-    return openbabelJNI.I_get();
-  }
-
-  public static long get_1MA() {
-    return openbabelJNI._1MA_get();
-  }
-
-  public static long get_5MC() {
-    return openbabelJNI._5MC_get();
-  }
-
-  public static long getOMC() {
-    return openbabelJNI.OMC_get();
-  }
-
-  public static long get_1MG() {
-    return openbabelJNI._1MG_get();
-  }
-
-  public static long get_2MG() {
-    return openbabelJNI._2MG_get();
-  }
-
-  public static long getM2G() {
-    return openbabelJNI.M2G_get();
-  }
-
-  public static long get_7MG() {
-    return openbabelJNI._7MG_get();
-  }
-
-  public static long getOMG() {
-    return openbabelJNI.OMG_get();
-  }
-
-  public static long getYG() {
-    return openbabelJNI.YG_get();
-  }
-
-  public static long getH2U() {
-    return openbabelJNI.H2U_get();
-  }
-
-  public static long get_5MU() {
-    return openbabelJNI._5MU_get();
-  }
-
-  public static long getPSU() {
-    return openbabelJNI.PSU_get();
-  }
-
-  public static long getUNK() {
-    return openbabelJNI.UNK_get();
-  }
-
-  public static long getACE() {
-    return openbabelJNI.ACE_get();
-  }
-
-  public static long getFOR() {
-    return openbabelJNI.FOR_get();
-  }
-
-  public static long getHOH() {
-    return openbabelJNI.HOH_get();
-  }
-
-  public static long getDOD() {
-    return openbabelJNI.DOD_get();
-  }
-
-  public static long getSO4() {
-    return openbabelJNI.SO4_get();
-  }
-
-  public static long getPO4() {
-    return openbabelJNI.PO4_get();
-  }
-
-  public static long getNAD() {
-    return openbabelJNI.NAD_get();
-  }
-
-  public static long getCOA() {
-    return openbabelJNI.COA_get();
-  }
-
-  public static long getNAP() {
-    return openbabelJNI.NAP_get();
-  }
-
-  public static long getNDP() {
-    return openbabelJNI.NDP_get();
-  }
-
-  public static long getAMINO() {
-    return openbabelJNI.AMINO_get();
-  }
-
-  public static long getAMINO_NUCLEO() {
-    return openbabelJNI.AMINO_NUCLEO_get();
-  }
-
-  public static long getCOENZYME() {
-    return openbabelJNI.COENZYME_get();
-  }
-
-  public static long getION() {
-    return openbabelJNI.ION_get();
-  }
-
-  public static long getNUCLEO() {
-    return openbabelJNI.NUCLEO_get();
-  }
-
-  public static long getPROTEIN() {
-    return openbabelJNI.PROTEIN_get();
-  }
-
-  public static long getPURINE() {
-    return openbabelJNI.PURINE_get();
-  }
-
-  public static long getPYRIMIDINE() {
-    return openbabelJNI.PYRIMIDINE_get();
-  }
-
-  public static long getSOLVENT() {
-    return openbabelJNI.SOLVENT_get();
-  }
-
-  public static long getWATER() {
-    return openbabelJNI.WATER_get();
-  }
-
   public static void setResidue(SWIGTYPE_p_a_4__char value) {
     openbabelJNI.Residue_set(SWIGTYPE_p_a_4__char.getCPtr(value));
   }
diff --git a/scripts/java/openbabelConstants.java b/scripts/java/openbabelConstants.java
index cb5f5d234..c295a0800 100644
--- a/scripts/java/openbabelConstants.java
+++ b/scripts/java/openbabelConstants.java
@@ -12,6 +12,47 @@ public interface openbabelConstants {
   public final static double M_PI = openbabelJNI.M_PI_get();
   public final static double RAD_TO_DEG = openbabelJNI.RAD_TO_DEG_get();
   public final static double DEG_TO_RAD = openbabelJNI.DEG_TO_RAD_get();
+  public final static int UndefinedData = openbabelJNI.UndefinedData_get();
+  public final static int PairData = openbabelJNI.PairData_get();
+  public final static int EnergyData = openbabelJNI.EnergyData_get();
+  public final static int CommentData = openbabelJNI.CommentData_get();
+  public final static int ConformerData = openbabelJNI.ConformerData_get();
+  public final static int ExternalBondData = openbabelJNI.ExternalBondData_get();
+  public final static int RotamerList = openbabelJNI.RotamerList_get();
+  public final static int VirtualBondData = openbabelJNI.VirtualBondData_get();
+  public final static int RingData = openbabelJNI.RingData_get();
+  public final static int TorsionData = openbabelJNI.TorsionData_get();
+  public final static int AngleData = openbabelJNI.AngleData_get();
+  public final static int SerialNums = openbabelJNI.SerialNums_get();
+  public final static int UnitCell = openbabelJNI.UnitCell_get();
+  public final static int SpinData = openbabelJNI.SpinData_get();
+  public final static int ChargeData = openbabelJNI.ChargeData_get();
+  public final static int SymmetryData = openbabelJNI.SymmetryData_get();
+  public final static int ChiralData = openbabelJNI.ChiralData_get();
+  public final static int OccupationData = openbabelJNI.OccupationData_get();
+  public final static int DensityData = openbabelJNI.DensityData_get();
+  public final static int ElectronicData = openbabelJNI.ElectronicData_get();
+  public final static int VibrationData = openbabelJNI.VibrationData_get();
+  public final static int RotationData = openbabelJNI.RotationData_get();
+  public final static int NuclearData = openbabelJNI.NuclearData_get();
+  public final static int SetData = openbabelJNI.SetData_get();
+  public final static int CustomData0 = openbabelJNI.CustomData0_get();
+  public final static int CustomData1 = openbabelJNI.CustomData1_get();
+  public final static int CustomData2 = openbabelJNI.CustomData2_get();
+  public final static int CustomData3 = openbabelJNI.CustomData3_get();
+  public final static int CustomData4 = openbabelJNI.CustomData4_get();
+  public final static int CustomData5 = openbabelJNI.CustomData5_get();
+  public final static int CustomData6 = openbabelJNI.CustomData6_get();
+  public final static int CustomData7 = openbabelJNI.CustomData7_get();
+  public final static int CustomData8 = openbabelJNI.CustomData8_get();
+  public final static int CustomData9 = openbabelJNI.CustomData9_get();
+  public final static int CustomData10 = openbabelJNI.CustomData10_get();
+  public final static int CustomData11 = openbabelJNI.CustomData11_get();
+  public final static int CustomData12 = openbabelJNI.CustomData12_get();
+  public final static int CustomData13 = openbabelJNI.CustomData13_get();
+  public final static int CustomData14 = openbabelJNI.CustomData14_get();
+  public final static int CustomData15 = openbabelJNI.CustomData15_get();
+
   public final static int NOTREADABLE = openbabelJNI.NOTREADABLE_get();
   public final static int READONEONLY = openbabelJNI.READONEONLY_get();
   public final static int READBINARY = openbabelJNI.READBINARY_get();
@@ -46,6 +87,101 @@ public interface openbabelConstants {
   public final static int AA_CYS = openbabelJNI.AA_CYS_get();
   public final static int AA_MET = openbabelJNI.AA_MET_get();
   public final static int AA_TRP = openbabelJNI.AA_TRP_get();
+  public final static int ACIDIC = openbabelJNI.ACIDIC_get();
+  public final static int ACYCLIC = openbabelJNI.ACYCLIC_get();
+  public final static int ALIPHATIC = openbabelJNI.ALIPHATIC_get();
+  public final static int AROMATIC = openbabelJNI.AROMATIC_get();
+  public final static int BASIC = openbabelJNI.BASIC_get();
+  public final static int BURIED = openbabelJNI.BURIED_get();
+  public final static int CHARGED = openbabelJNI.CHARGED_get();
+  public final static int CYCLIC = openbabelJNI.CYCLIC_get();
+  public final static int HYDROPHOBIC = openbabelJNI.HYDROPHOBIC_get();
+  public final static int LARGE = openbabelJNI.LARGE_get();
+  public final static int MEDIUM = openbabelJNI.MEDIUM_get();
+  public final static int NEGATIVE = openbabelJNI.NEGATIVE_get();
+  public final static int NEUTRAL = openbabelJNI.NEUTRAL_get();
+  public final static int POLAR = openbabelJNI.POLAR_get();
+  public final static int POSITIVE = openbabelJNI.POSITIVE_get();
+  public final static int SMALL = openbabelJNI.SMALL_get();
+  public final static int SURFACE = openbabelJNI.SURFACE_get();
+
+  public final static int ALPHA_CARBON = openbabelJNI.ALPHA_CARBON_get();
+  public final static int AMINO_BACKBONE = openbabelJNI.AMINO_BACKBONE_get();
+  public final static int BACKBONE = openbabelJNI.BACKBONE_get();
+  public final static int CYSTEINE_SULPHUR = openbabelJNI.CYSTEINE_SULPHUR_get();
+  public final static int LIGAND = openbabelJNI.LIGAND_get();
+  public final static int NUCLEIC_BACKBONE = openbabelJNI.NUCLEIC_BACKBONE_get();
+  public final static int SHAPELY_BACKBONE = openbabelJNI.SHAPELY_BACKBONE_get();
+  public final static int SHAPELY_SPECIAL = openbabelJNI.SHAPELY_SPECIAL_get();
+  public final static int SIDECHAIN = openbabelJNI.SIDECHAIN_get();
+  public final static int SUGAR_PHOSPHATE = openbabelJNI.SUGAR_PHOSPHATE_get();
+
+  public final static int ALA = openbabelJNI.ALA_get();
+  public final static int GLY = openbabelJNI.GLY_get();
+  public final static int LEU = openbabelJNI.LEU_get();
+  public final static int SER = openbabelJNI.SER_get();
+  public final static int VAL = openbabelJNI.VAL_get();
+  public final static int THR = openbabelJNI.THR_get();
+  public final static int LYS = openbabelJNI.LYS_get();
+  public final static int ASP = openbabelJNI.ASP_get();
+  public final static int ILE = openbabelJNI.ILE_get();
+  public final static int ASN = openbabelJNI.ASN_get();
+  public final static int GLU = openbabelJNI.GLU_get();
+  public final static int PRO = openbabelJNI.PRO_get();
+  public final static int ARG = openbabelJNI.ARG_get();
+  public final static int PHE = openbabelJNI.PHE_get();
+  public final static int GLN = openbabelJNI.GLN_get();
+  public final static int TYR = openbabelJNI.TYR_get();
+  public final static int HIS = openbabelJNI.HIS_get();
+  public final static int CYS = openbabelJNI.CYS_get();
+  public final static int MET = openbabelJNI.MET_get();
+  public final static int TRP = openbabelJNI.TRP_get();
+  public final static int ASX = openbabelJNI.ASX_get();
+  public final static int GLX = openbabelJNI.GLX_get();
+  public final static int PCA = openbabelJNI.PCA_get();
+  public final static int HYP = openbabelJNI.HYP_get();
+  public final static int A = openbabelJNI.A_get();
+  public final static int C = openbabelJNI.C_get();
+  public final static int G = openbabelJNI.G_get();
+  public final static int T = openbabelJNI.T_get();
+  public final static int U = openbabelJNI.U_get();
+  public final static int UPLUS = openbabelJNI.UPLUS_get();
+  public final static int I = openbabelJNI.I_get();
+  public final static int _1MA = openbabelJNI._1MA_get();
+  public final static int _5MC = openbabelJNI._5MC_get();
+  public final static int OMC = openbabelJNI.OMC_get();
+  public final static int _1MG = openbabelJNI._1MG_get();
+  public final static int _2MG = openbabelJNI._2MG_get();
+  public final static int M2G = openbabelJNI.M2G_get();
+  public final static int _7MG = openbabelJNI._7MG_get();
+  public final static int OMG = openbabelJNI.OMG_get();
+  public final static int YG = openbabelJNI.YG_get();
+  public final static int H2U = openbabelJNI.H2U_get();
+  public final static int _5MU = openbabelJNI._5MU_get();
+  public final static int PSU = openbabelJNI.PSU_get();
+  public final static int UNK = openbabelJNI.UNK_get();
+  public final static int ACE = openbabelJNI.ACE_get();
+  public final static int FOR = openbabelJNI.FOR_get();
+  public final static int HOH = openbabelJNI.HOH_get();
+  public final static int DOD = openbabelJNI.DOD_get();
+  public final static int SO4 = openbabelJNI.SO4_get();
+  public final static int PO4 = openbabelJNI.PO4_get();
+  public final static int NAD = openbabelJNI.NAD_get();
+  public final static int COA = openbabelJNI.COA_get();
+  public final static int NAP = openbabelJNI.NAP_get();
+  public final static int NDP = openbabelJNI.NDP_get();
+
+  public final static int AMINO = openbabelJNI.AMINO_get();
+  public final static int AMINO_NUCLEO = openbabelJNI.AMINO_NUCLEO_get();
+  public final static int COENZYME = openbabelJNI.COENZYME_get();
+  public final static int ION = openbabelJNI.ION_get();
+  public final static int NUCLEO = openbabelJNI.NUCLEO_get();
+  public final static int PROTEIN = openbabelJNI.PROTEIN_get();
+  public final static int PURINE = openbabelJNI.PURINE_get();
+  public final static int PYRIMIDINE = openbabelJNI.PYRIMIDINE_get();
+  public final static int SOLVENT = openbabelJNI.SOLVENT_get();
+  public final static int WATER = openbabelJNI.WATER_get();
+
   public final static int OB_4RING_ATOM = openbabelJNI.OB_4RING_ATOM_get();
   public final static int OB_3RING_ATOM = openbabelJNI.OB_3RING_ATOM_get();
   public final static int OB_AROMATIC_ATOM = openbabelJNI.OB_AROMATIC_ATOM_get();
diff --git a/scripts/java/openbabelJNI.java b/scripts/java/openbabelJNI.java
index 1e45605f1..3927da77f 100644
--- a/scripts/java/openbabelJNI.java
+++ b/scripts/java/openbabelJNI.java
@@ -233,6 +233,7 @@ class openbabelJNI {
   public final static native double vectorAngle(long jarg1, vector3 jarg1_, long jarg2, vector3 jarg2_);
   public final static native double CalcTorsionAngle(long jarg1, vector3 jarg1_, long jarg2, vector3 jarg2_, long jarg3, vector3 jarg3_, long jarg4, vector3 jarg4_);
   public final static native double Point2Plane(long jarg1, vector3 jarg1_, long jarg2, vector3 jarg2_, long jarg3, vector3 jarg3_, long jarg4, vector3 jarg4_);
+  public final static native double Point2PlaneAngle(long jarg1, vector3 jarg1_, long jarg2, vector3 jarg2_, long jarg3, vector3 jarg3_, long jarg4, vector3 jarg4_);
   public final static native long VZero_get();
   public final static native long VX_get();
   public final static native long VY_get();
@@ -264,46 +265,46 @@ class openbabelJNI {
   public final static native void matrix3x3_jacobi(long jarg1, long jarg2, long jarg3, long jarg4);
   public final static native void delete_matrix3x3(long jarg1);
   public final static native long Trim(long jarg1);
-  public final static native long UndefinedData_get();
-  public final static native long PairData_get();
-  public final static native long EnergyData_get();
-  public final static native long CommentData_get();
-  public final static native long ConformerData_get();
-  public final static native long ExternalBondData_get();
-  public final static native long RotamerList_get();
-  public final static native long VirtualBondData_get();
-  public final static native long RingData_get();
-  public final static native long TorsionData_get();
-  public final static native long AngleData_get();
-  public final static native long SerialNums_get();
-  public final static native long UnitCell_get();
-  public final static native long SpinData_get();
-  public final static native long ChargeData_get();
-  public final static native long SymmetryData_get();
-  public final static native long ChiralData_get();
-  public final static native long OccupationData_get();
-  public final static native long DensityData_get();
-  public final static native long ElectronicData_get();
-  public final static native long VibrationData_get();
-  public final static native long RotationData_get();
-  public final static native long NuclearData_get();
-  public final static native long SetData_get();
-  public final static native long CustomData0_get();
-  public final static native long CustomData1_get();
-  public final static native long CustomData2_get();
-  public final static native long CustomData3_get();
-  public final static native long CustomData4_get();
-  public final static native long CustomData5_get();
-  public final static native long CustomData6_get();
-  public final static native long CustomData7_get();
-  public final static native long CustomData8_get();
-  public final static native long CustomData9_get();
-  public final static native long CustomData10_get();
-  public final static native long CustomData11_get();
-  public final static native long CustomData12_get();
-  public final static native long CustomData13_get();
-  public final static native long CustomData14_get();
-  public final static native long CustomData15_get();
+  public final static native int UndefinedData_get();
+  public final static native int PairData_get();
+  public final static native int EnergyData_get();
+  public final static native int CommentData_get();
+  public final static native int ConformerData_get();
+  public final static native int ExternalBondData_get();
+  public final static native int RotamerList_get();
+  public final static native int VirtualBondData_get();
+  public final static native int RingData_get();
+  public final static native int TorsionData_get();
+  public final static native int AngleData_get();
+  public final static native int SerialNums_get();
+  public final static native int UnitCell_get();
+  public final static native int SpinData_get();
+  public final static native int ChargeData_get();
+  public final static native int SymmetryData_get();
+  public final static native int ChiralData_get();
+  public final static native int OccupationData_get();
+  public final static native int DensityData_get();
+  public final static native int ElectronicData_get();
+  public final static native int VibrationData_get();
+  public final static native int RotationData_get();
+  public final static native int NuclearData_get();
+  public final static native int SetData_get();
+  public final static native int CustomData0_get();
+  public final static native int CustomData1_get();
+  public final static native int CustomData2_get();
+  public final static native int CustomData3_get();
+  public final static native int CustomData4_get();
+  public final static native int CustomData5_get();
+  public final static native int CustomData6_get();
+  public final static native int CustomData7_get();
+  public final static native int CustomData8_get();
+  public final static native int CustomData9_get();
+  public final static native int CustomData10_get();
+  public final static native int CustomData11_get();
+  public final static native int CustomData12_get();
+  public final static native int CustomData13_get();
+  public final static native int CustomData14_get();
+  public final static native int CustomData15_get();
   public final static native long new_OBGenericData__SWIG_0(String jarg1, long jarg2, int jarg3);
   public final static native long new_OBGenericData__SWIG_1(String jarg1, long jarg2);
   public final static native long new_OBGenericData__SWIG_2(String jarg1);
@@ -713,97 +714,97 @@ class openbabelJNI {
   public final static native int AA_CYS_get();
   public final static native int AA_MET_get();
   public final static native int AA_TRP_get();
-  public final static native long ACIDIC_get();
-  public final static native long ACYCLIC_get();
-  public final static native long ALIPHATIC_get();
-  public final static native long AROMATIC_get();
-  public final static native long BASIC_get();
-  public final static native long BURIED_get();
-  public final static native long CHARGED_get();
-  public final static native long CYCLIC_get();
-  public final static native long HYDROPHOBIC_get();
-  public final static native long LARGE_get();
-  public final static native long MEDIUM_get();
-  public final static native long NEGATIVE_get();
-  public final static native long NEUTRAL_get();
-  public final static native long POLAR_get();
-  public final static native long POSITIVE_get();
-  public final static native long SMALL_get();
-  public final static native long SURFACE_get();
-  public final static native long ALPHA_CARBON_get();
-  public final static native long AMINO_BACKBONE_get();
-  public final static native long BACKBONE_get();
-  public final static native long CYSTEINE_SULPHUR_get();
-  public final static native long LIGAND_get();
-  public final static native long NUCLEIC_BACKBONE_get();
-  public final static native long SHAPELY_BACKBONE_get();
-  public final static native long SHAPELY_SPECIAL_get();
-  public final static native long SIDECHAIN_get();
-  public final static native long SUGAR_PHOSPHATE_get();
-  public final static native long ALA_get();
-  public final static native long GLY_get();
-  public final static native long LEU_get();
-  public final static native long SER_get();
-  public final static native long VAL_get();
-  public final static native long THR_get();
-  public final static native long LYS_get();
-  public final static native long ASP_get();
-  public final static native long ILE_get();
-  public final static native long ASN_get();
-  public final static native long GLU_get();
-  public final static native long PRO_get();
-  public final static native long ARG_get();
-  public final static native long PHE_get();
-  public final static native long GLN_get();
-  public final static native long TYR_get();
-  public final static native long HIS_get();
-  public final static native long CYS_get();
-  public final static native long MET_get();
-  public final static native long TRP_get();
-  public final static native long ASX_get();
-  public final static native long GLX_get();
-  public final static native long PCA_get();
-  public final static native long HYP_get();
-  public final static native long A_get();
-  public final static native long C_get();
-  public final static native long G_get();
-  public final static native long T_get();
-  public final static native long U_get();
-  public final static native long UPLUS_get();
-  public final static native long I_get();
-  public final static native long _1MA_get();
-  public final static native long _5MC_get();
-  public final static native long OMC_get();
-  public final static native long _1MG_get();
-  public final static native long _2MG_get();
-  public final static native long M2G_get();
-  public final static native long _7MG_get();
-  public final static native long OMG_get();
-  public final static native long YG_get();
-  public final static native long H2U_get();
-  public final static native long _5MU_get();
-  public final static native long PSU_get();
-  public final static native long UNK_get();
-  public final static native long ACE_get();
-  public final static native long FOR_get();
-  public final static native long HOH_get();
-  public final static native long DOD_get();
-  public final static native long SO4_get();
-  public final static native long PO4_get();
-  public final static native long NAD_get();
-  public final static native long COA_get();
-  public final static native long NAP_get();
-  public final static native long NDP_get();
-  public final static native long AMINO_get();
-  public final static native long AMINO_NUCLEO_get();
-  public final static native long COENZYME_get();
-  public final static native long ION_get();
-  public final static native long NUCLEO_get();
-  public final static native long PROTEIN_get();
-  public final static native long PURINE_get();
-  public final static native long PYRIMIDINE_get();
-  public final static native long SOLVENT_get();
-  public final static native long WATER_get();
+  public final static native int ACIDIC_get();
+  public final static native int ACYCLIC_get();
+  public final static native int ALIPHATIC_get();
+  public final static native int AROMATIC_get();
+  public final static native int BASIC_get();
+  public final static native int BURIED_get();
+  public final static native int CHARGED_get();
+  public final static native int CYCLIC_get();
+  public final static native int HYDROPHOBIC_get();
+  public final static native int LARGE_get();
+  public final static native int MEDIUM_get();
+  public final static native int NEGATIVE_get();
+  public final static native int NEUTRAL_get();
+  public final static native int POLAR_get();
+  public final static native int POSITIVE_get();
+  public final static native int SMALL_get();
+  public final static native int SURFACE_get();
+  public final static native int ALPHA_CARBON_get();
+  public final static native int AMINO_BACKBONE_get();
+  public final static native int BACKBONE_get();
+  public final static native int CYSTEINE_SULPHUR_get();
+  public final static native int LIGAND_get();
+  public final static native int NUCLEIC_BACKBONE_get();
+  public final static native int SHAPELY_BACKBONE_get();
+  public final static native int SHAPELY_SPECIAL_get();
+  public final static native int SIDECHAIN_get();
+  public final static native int SUGAR_PHOSPHATE_get();
+  public final static native int ALA_get();
+  public final static native int GLY_get();
+  public final static native int LEU_get();
+  public final static native int SER_get();
+  public final static native int VAL_get();
+  public final static native int THR_get();
+  public final static native int LYS_get();
+  public final static native int ASP_get();
+  public final static native int ILE_get();
+  public final static native int ASN_get();
+  public final static native int GLU_get();
+  public final static native int PRO_get();
+  public final static native int ARG_get();
+  public final static native int PHE_get();
+  public final static native int GLN_get();
+  public final static native int TYR_get();
+  public final static native int HIS_get();
+  public final static native int CYS_get();
+  public final static native int MET_get();
+  public final static native int TRP_get();
+  public final static native int ASX_get();
+  public final static native int GLX_get();
+  public final static native int PCA_get();
+  public final static native int HYP_get();
+  public final static native int A_get();
+  public final static native int C_get();
+  public final static native int G_get();
+  public final static native int T_get();
+  public final static native int U_get();
+  public final static native int UPLUS_get();
+  public final static native int I_get();
+  public final static native int _1MA_get();
+  public final static native int _5MC_get();
+  public final static native int OMC_get();
+  public final static native int _1MG_get();
+  public final static native int _2MG_get();
+  public final static native int M2G_get();
+  public final static native int _7MG_get();
+  public final static native int OMG_get();
+  public final static native int YG_get();
+  public final static native int H2U_get();
+  public final static native int _5MU_get();
+  public final static native int PSU_get();
+  public final static native int UNK_get();
+  public final static native int ACE_get();
+  public final static native int FOR_get();
+  public final static native int HOH_get();
+  public final static native int DOD_get();
+  public final static native int SO4_get();
+  public final static native int PO4_get();
+  public final static native int NAD_get();
+  public final static native int COA_get();
+  public final static native int NAP_get();
+  public final static native int NDP_get();
+  public final static native int AMINO_get();
+  public final static native int AMINO_NUCLEO_get();
+  public final static native int COENZYME_get();
+  public final static native int ION_get();
+  public final static native int NUCLEO_get();
+  public final static native int PROTEIN_get();
+  public final static native int PURINE_get();
+  public final static native int PYRIMIDINE_get();
+  public final static native int SOLVENT_get();
+  public final static native int WATER_get();
   public final static native void Residue_set(long jarg1);
   public final static native long Residue_get();
   public final static native void ElemDesc_set(long jarg1);
@@ -1011,7 +1012,7 @@ class openbabelJNI {
   public final static native long OBBond_GetParent(long jarg1, OBBond jarg1_);
   public final static native double OBBond_GetEquibLength(long jarg1, OBBond jarg1_);
   public final static native double OBBond_GetLength(long jarg1, OBBond jarg1_);
-  public final static native int OBBond_GetNbrAtomIdx(long jarg1, OBBond jarg1_, long jarg2, OBAtom jarg2_);
+  public final static native long OBBond_GetNbrAtomIdx(long jarg1, OBBond jarg1_, long jarg2, OBAtom jarg2_);
   public final static native boolean OBBond_IsAromatic(long jarg1, OBBond jarg1_);
   public final static native boolean OBBond_IsInRing(long jarg1, OBBond jarg1_);
   public final static native boolean OBBond_IsRotor(long jarg1, OBBond jarg1_);
@@ -1886,7 +1887,7 @@ class openbabelJNI {
   public final static native long OBMolBondIter_GetParent(long jarg1, OBMolBondIter jarg1_);
   public final static native double OBMolBondIter_GetEquibLength(long jarg1, OBMolBondIter jarg1_);
   public final static native double OBMolBondIter_GetLength(long jarg1, OBMolBondIter jarg1_);
-  public final static native int OBMolBondIter_GetNbrAtomIdx(long jarg1, OBMolBondIter jarg1_, long jarg2, OBAtom jarg2_);
+  public final static native long OBMolBondIter_GetNbrAtomIdx(long jarg1, OBMolBondIter jarg1_, long jarg2, OBAtom jarg2_);
   public final static native boolean OBMolBondIter_IsAromatic(long jarg1, OBMolBondIter jarg1_);
   public final static native boolean OBMolBondIter_IsInRing(long jarg1, OBMolBondIter jarg1_);
   public final static native boolean OBMolBondIter_IsRotor(long jarg1, OBMolBondIter jarg1_);
@@ -2123,7 +2124,7 @@ class openbabelJNI {
   public final static native long OBAtomBondIter_GetParent(long jarg1, OBAtomBondIter jarg1_);
   public final static native double OBAtomBondIter_GetEquibLength(long jarg1, OBAtomBondIter jarg1_);
   public final static native double OBAtomBondIter_GetLength(long jarg1, OBAtomBondIter jarg1_);
-  public final static native int OBAtomBondIter_GetNbrAtomIdx(long jarg1, OBAtomBondIter jarg1_, long jarg2, OBAtom jarg2_);
+  public final static native long OBAtomBondIter_GetNbrAtomIdx(long jarg1, OBAtomBondIter jarg1_, long jarg2, OBAtom jarg2_);
   public final static native boolean OBAtomBondIter_IsAromatic(long jarg1, OBAtomBondIter jarg1_);
   public final static native boolean OBAtomBondIter_IsInRing(long jarg1, OBAtomBondIter jarg1_);
   public final static native boolean OBAtomBondIter_IsRotor(long jarg1, OBAtomBondIter jarg1_);
diff --git a/scripts/java/openbabel_java.cpp b/scripts/java/openbabel_java.cpp
index 7d91eab17..16d9d20d2 100644
--- a/scripts/java/openbabel_java.cpp
+++ b/scripts/java/openbabel_java.cpp
@@ -4159,6 +4159,54 @@ SWIGEXPORT jdouble JNICALL Java_openbabelJNI_Point2Plane(JNIEnv *jenv, jclass jc
 }
 
 
+SWIGEXPORT jdouble JNICALL Java_openbabelJNI_Point2PlaneAngle(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_) {
+  jdouble jresult = 0 ;
+  OpenBabel::vector3 arg1 ;
+  OpenBabel::vector3 arg2 ;
+  OpenBabel::vector3 arg3 ;
+  OpenBabel::vector3 arg4 ;
+  double result;
+  OpenBabel::vector3 const *argp1 ;
+  OpenBabel::vector3 const *argp2 ;
+  OpenBabel::vector3 const *argp3 ;
+  OpenBabel::vector3 const *argp4 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  (void)jarg4_;
+  argp1 = *(OpenBabel::vector3 **)&jarg1; 
+  if (!argp1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null OpenBabel::vector3 const");
+    return 0;
+  }
+  arg1 = *argp1; 
+  argp2 = *(OpenBabel::vector3 **)&jarg2; 
+  if (!argp2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null OpenBabel::vector3 const");
+    return 0;
+  }
+  arg2 = *argp2; 
+  argp3 = *(OpenBabel::vector3 **)&jarg3; 
+  if (!argp3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null OpenBabel::vector3 const");
+    return 0;
+  }
+  arg3 = *argp3; 
+  argp4 = *(OpenBabel::vector3 **)&jarg4; 
+  if (!argp4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null OpenBabel::vector3 const");
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (double)OpenBabel::Point2PlaneAngle(arg1,arg2,arg3,arg4);
+  jresult = (jdouble)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_openbabelJNI_VZero_1get(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   OpenBabel::vector3 *result = 0 ;
@@ -4692,482 +4740,482 @@ SWIGEXPORT jlong JNICALL Java_openbabelJNI_Trim(JNIEnv *jenv, jclass jcls, jlong
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_UndefinedData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_UndefinedData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::UndefinedData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::UndefinedData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PairData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PairData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::PairData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::PairData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_EnergyData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_EnergyData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::EnergyData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::EnergyData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CommentData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CommentData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CommentData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CommentData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ConformerData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ConformerData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::ConformerData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::ConformerData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ExternalBondData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ExternalBondData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::ExternalBondData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::ExternalBondData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_RotamerList_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_RotamerList_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::RotamerList;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::RotamerList;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_VirtualBondData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_VirtualBondData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::VirtualBondData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::VirtualBondData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_RingData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_RingData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::RingData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::RingData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_TorsionData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_TorsionData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::TorsionData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::TorsionData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_AngleData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_AngleData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::AngleData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::AngleData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SerialNums_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SerialNums_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::SerialNums;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::SerialNums;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_UnitCell_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_UnitCell_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::UnitCell;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::UnitCell;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SpinData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SpinData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::SpinData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::SpinData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ChargeData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ChargeData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::ChargeData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::ChargeData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SymmetryData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SymmetryData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::SymmetryData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::SymmetryData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ChiralData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ChiralData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::ChiralData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::ChiralData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_OccupationData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_OccupationData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::OccupationData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::OccupationData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_DensityData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_DensityData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::DensityData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::DensityData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ElectronicData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ElectronicData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::ElectronicData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::ElectronicData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_VibrationData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_VibrationData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::VibrationData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::VibrationData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_RotationData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_RotationData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::RotationData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::RotationData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NuclearData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NuclearData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::NuclearData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::NuclearData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SetData_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SetData_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::SetData;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::SetData;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData0_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData0_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData0;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData0;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData1_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData1_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData1;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData1;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData2_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData2_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData2;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData2;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData3_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData3_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData3;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData3;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData4_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData4_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData4;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData4;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData5_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData5_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData5;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData5;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData6_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData6_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData6;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData6;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData7_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData7_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData7;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData7;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData8_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData8_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData8;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData8;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData9_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData9_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData9;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData9;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData10_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData10_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData10;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData10;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData11_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData11_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData11;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData11;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData12_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData12_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData12;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData12;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData13_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData13_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData13;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData13;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData14_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData14_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData14;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData14;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CustomData15_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CustomData15_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBGenericDataType::CustomData15;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBGenericDataType::CustomData15;
+  jresult = (jint)result; 
   return jresult;
 }
 
@@ -12094,1094 +12142,1094 @@ SWIGEXPORT jint JNICALL Java_openbabelJNI_AA_1TRP_1get(JNIEnv *jenv, jclass jcls
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ACIDIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ACIDIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::ACIDIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::ACIDIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ACYCLIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ACYCLIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::ACYCLIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::ACYCLIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ALIPHATIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ALIPHATIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::ALIPHATIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::ALIPHATIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_AROMATIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_AROMATIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::AROMATIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::AROMATIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_BASIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_BASIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::BASIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::BASIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_BURIED_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_BURIED_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::BURIED;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::BURIED;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CHARGED_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CHARGED_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::CHARGED;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::CHARGED;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CYCLIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CYCLIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::CYCLIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::CYCLIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_HYDROPHOBIC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_HYDROPHOBIC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::HYDROPHOBIC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::HYDROPHOBIC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_LARGE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_LARGE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::LARGE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::LARGE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_MEDIUM_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_MEDIUM_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::MEDIUM;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::MEDIUM;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NEGATIVE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NEGATIVE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::NEGATIVE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::NEGATIVE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NEUTRAL_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NEUTRAL_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::NEUTRAL;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::NEUTRAL;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_POLAR_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_POLAR_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::POLAR;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::POLAR;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_POSITIVE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_POSITIVE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::POSITIVE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::POSITIVE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SMALL_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SMALL_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::SMALL;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::SMALL;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SURFACE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SURFACE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBAminoAcidProperty::SURFACE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBAminoAcidProperty::SURFACE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ALPHA_1CARBON_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ALPHA_1CARBON_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::ALPHA_CARBON;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::ALPHA_CARBON;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_AMINO_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_AMINO_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::BACKBONE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::BACKBONE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CYSTEINE_1SULPHUR_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CYSTEINE_1SULPHUR_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_LIGAND_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_LIGAND_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::LIGAND;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::LIGAND;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NUCLEIC_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NUCLEIC_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SHAPELY_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SHAPELY_1BACKBONE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SHAPELY_1SPECIAL_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SHAPELY_1SPECIAL_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SIDECHAIN_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SIDECHAIN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::SIDECHAIN;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::SIDECHAIN;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SUGAR_1PHOSPHATE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SUGAR_1PHOSPHATE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ALA_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ALA_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ALA;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ALA;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_GLY_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_GLY_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::GLY;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::GLY;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_LEU_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_LEU_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::LEU;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::LEU;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SER_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SER_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::SER;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::SER;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_VAL_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_VAL_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::VAL;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::VAL;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_THR_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_THR_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::THR;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::THR;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_LYS_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_LYS_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::LYS;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::LYS;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ASP_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ASP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ASP;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ASP;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ILE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ILE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ILE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ILE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ASN_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ASN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ASN;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ASN;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_GLU_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_GLU_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::GLU;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::GLU;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PRO_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PRO_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::PRO;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::PRO;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ARG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ARG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ARG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ARG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PHE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PHE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::PHE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::PHE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_GLN_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_GLN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::GLN;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::GLN;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_TYR_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_TYR_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::TYR;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::TYR;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_HIS_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_HIS_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::HIS;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::HIS;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_CYS_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_CYS_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::CYS;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::CYS;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_MET_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_MET_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::MET;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::MET;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_TRP_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_TRP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::TRP;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::TRP;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ASX_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ASX_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ASX;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ASX;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_GLX_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_GLX_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::GLX;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::GLX;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PCA_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PCA_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::PCA;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::PCA;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_HYP_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_HYP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::HYP;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::HYP;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_A_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_A_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::A;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::A;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_C_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_C_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::C;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::C;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_G_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_G_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::G;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::G;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_T_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_T_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::T;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::T;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_U_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_U_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::U;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::U;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_UPLUS_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_UPLUS_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::UPLUS;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::UPLUS;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_I_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_I_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::I;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::I;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__11MA_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__11MA_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_1MA;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_1MA;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__15MC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__15MC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_5MC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_5MC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_OMC_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_OMC_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::OMC;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::OMC;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__11MG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__11MG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_1MG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_1MG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__12MG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__12MG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_2MG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_2MG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_M2G_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_M2G_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::M2G;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::M2G;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__17MG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__17MG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_7MG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_7MG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_OMG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_OMG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::OMG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::OMG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_YG_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_YG_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::YG;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::YG;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_H2U_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_H2U_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::H2U;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::H2U;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI__15MU_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI__15MU_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::_5MU;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::_5MU;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PSU_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PSU_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::PSU;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::PSU;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_UNK_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_UNK_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::UNK;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::UNK;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ACE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ACE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::ACE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::ACE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_FOR_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_FOR_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::FOR;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::FOR;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_HOH_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_HOH_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::HOH;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::HOH;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_DOD_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_DOD_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::DOD;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::DOD;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SO4_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SO4_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::SO4;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::SO4;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PO4_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PO4_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::PO4;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::PO4;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NAD_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NAD_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::NAD;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::NAD;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_COA_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_COA_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::COA;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::COA;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NAP_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NAP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::NAP;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::NAP;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NDP_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NDP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueIndex::NDP;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueIndex::NDP;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_AMINO_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_AMINO_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::AMINO;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::AMINO;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_AMINO_1NUCLEO_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_AMINO_1NUCLEO_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::AMINO_NUCLEO;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::AMINO_NUCLEO;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_COENZYME_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_COENZYME_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::COENZYME;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::COENZYME;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_ION_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_ION_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::ION;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::ION;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_NUCLEO_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_NUCLEO_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::NUCLEO;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::NUCLEO;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PROTEIN_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PROTEIN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::PROTEIN;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::PROTEIN;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PURINE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PURINE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::PURINE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::PURINE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_PYRIMIDINE_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_PYRIMIDINE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::PYRIMIDINE;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::PYRIMIDINE;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_SOLVENT_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_SOLVENT_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::SOLVENT;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::SOLVENT;
+  jresult = (jint)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jlong JNICALL Java_openbabelJNI_WATER_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  unsigned int result;
+SWIGEXPORT jint JNICALL Java_openbabelJNI_WATER_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  int result;
   
   (void)jenv;
   (void)jcls;
-  result = (unsigned int)(unsigned int)OpenBabel::OBResidueProperty::WATER;
-  jresult = (jlong)result; 
+  result = (int)OpenBabel::OBResidueProperty::WATER;
+  jresult = (jint)result; 
   return jresult;
 }
 
@@ -16172,11 +16220,11 @@ SWIGEXPORT jdouble JNICALL Java_openbabelJNI_OBBond_1GetLength(JNIEnv *jenv, jcl
 }
 
 
-SWIGEXPORT jint JNICALL Java_openbabelJNI_OBBond_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
+SWIGEXPORT jlong JNICALL Java_openbabelJNI_OBBond_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
   OpenBabel::OBBond *arg1 = (OpenBabel::OBBond *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   
   (void)jenv;
   (void)jcls;
@@ -16184,8 +16232,8 @@ SWIGEXPORT jint JNICALL Java_openbabelJNI_OBBond_1GetNbrAtomIdx(JNIEnv *jenv, jc
   (void)jarg2_;
   arg1 = *(OpenBabel::OBBond **)&jarg1; 
   arg2 = *(OpenBabel::OBAtom **)&jarg2; 
-  result = (int)(arg1)->GetNbrAtomIdx(arg2);
-  jresult = (jint)result; 
+  result = (unsigned int)(arg1)->GetNbrAtomIdx(arg2);
+  jresult = (jlong)result; 
   return jresult;
 }
 
@@ -29843,11 +29891,11 @@ SWIGEXPORT jdouble JNICALL Java_openbabelJNI_OBMolBondIter_1GetLength(JNIEnv *je
 }
 
 
-SWIGEXPORT jint JNICALL Java_openbabelJNI_OBMolBondIter_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
+SWIGEXPORT jlong JNICALL Java_openbabelJNI_OBMolBondIter_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
   OpenBabel::OBMolBondIter *arg1 = (OpenBabel::OBMolBondIter *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   
   (void)jenv;
   (void)jcls;
@@ -29855,8 +29903,8 @@ SWIGEXPORT jint JNICALL Java_openbabelJNI_OBMolBondIter_1GetNbrAtomIdx(JNIEnv *j
   (void)jarg2_;
   arg1 = *(OpenBabel::OBMolBondIter **)&jarg1; 
   arg2 = *(OpenBabel::OBAtom **)&jarg2; 
-  result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-  jresult = (jint)result; 
+  result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+  jresult = (jlong)result; 
   return jresult;
 }
 
@@ -33374,11 +33422,11 @@ SWIGEXPORT jdouble JNICALL Java_openbabelJNI_OBAtomBondIter_1GetLength(JNIEnv *j
 }
 
 
-SWIGEXPORT jint JNICALL Java_openbabelJNI_OBAtomBondIter_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
+SWIGEXPORT jlong JNICALL Java_openbabelJNI_OBAtomBondIter_1GetNbrAtomIdx(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
   OpenBabel::OBAtomBondIter *arg1 = (OpenBabel::OBAtomBondIter *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   
   (void)jenv;
   (void)jcls;
@@ -33386,8 +33434,8 @@ SWIGEXPORT jint JNICALL Java_openbabelJNI_OBAtomBondIter_1GetNbrAtomIdx(JNIEnv *
   (void)jarg2_;
   arg1 = *(OpenBabel::OBAtomBondIter **)&jarg1; 
   arg2 = *(OpenBabel::OBAtom **)&jarg2; 
-  result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-  jresult = (jint)result; 
+  result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+  jresult = (jlong)result; 
   return jresult;
 }
 
diff --git a/scripts/perl/OpenBabel.pm b/scripts/perl/OpenBabel.pm
index b8919ff36..944d8b70f 100644
--- a/scripts/perl/OpenBabel.pm
+++ b/scripts/perl/OpenBabel.pm
@@ -63,6 +63,7 @@ package Chemistry::OpenBabel;
 *vectorAngle = *Chemistry::OpenBabelc::vectorAngle;
 *CalcTorsionAngle = *Chemistry::OpenBabelc::CalcTorsionAngle;
 *Point2Plane = *Chemistry::OpenBabelc::Point2Plane;
+*Point2PlaneAngle = *Chemistry::OpenBabelc::Point2PlaneAngle;
 *Trim = *Chemistry::OpenBabelc::Trim;
 *tokenize = *Chemistry::OpenBabelc::tokenize;
 *ThrowError = *Chemistry::OpenBabelc::ThrowError;
diff --git a/scripts/perl/openbabel_perl.cpp b/scripts/perl/openbabel_perl.cpp
index bd9bc8c01..be3cd9448 100644
--- a/scripts/perl/openbabel_perl.cpp
+++ b/scripts/perl/openbabel_perl.cpp
@@ -2381,286 +2381,6 @@ SWIGCLASS_STATIC int _wrap_VZ_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
 }
 
 
-SWIGCLASS_STATIC int _wrap_UndefinedData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::UndefinedData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PairData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::PairData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_EnergyData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::EnergyData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CommentData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CommentData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ConformerData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ConformerData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ExternalBondData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ExternalBondData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_RotamerList_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RotamerList)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_VirtualBondData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::VirtualBondData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_RingData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RingData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_TorsionData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::TorsionData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_AngleData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::AngleData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SerialNums_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SerialNums)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_UnitCell_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::UnitCell)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SpinData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SpinData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ChargeData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ChargeData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SymmetryData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SymmetryData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ChiralData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ChiralData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_OccupationData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::OccupationData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_DensityData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::DensityData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ElectronicData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ElectronicData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_VibrationData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::VibrationData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_RotationData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RotationData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NuclearData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::NuclearData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SetData_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SetData)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData0_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData0)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData1_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData1)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData2_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData2)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData3_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData3)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData4_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData4)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData5_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData5)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData6_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData6)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData7_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData7)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData8_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData8)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData9_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData9)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData10_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData10)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData11_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData11)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData12_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData12)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData13_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData13)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData14_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData14)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CustomData15_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData15)))  ;
-  return 1;
-}
-
-
 SWIGCLASS_STATIC int _wrap_obErrorLog_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) {
   MAGIC_PPERL
   {
@@ -2687,636 +2407,6 @@ SWIGCLASS_STATIC int _wrap_obErrorLog_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg
 }
 
 
-SWIGCLASS_STATIC int _wrap_ACIDIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ACIDIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ACYCLIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ACYCLIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ALIPHATIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ALIPHATIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_AROMATIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::AROMATIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_BASIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::BASIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_BURIED_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::BURIED)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CHARGED_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::CHARGED)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CYCLIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::CYCLIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_HYDROPHOBIC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::HYDROPHOBIC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_LARGE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::LARGE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_MEDIUM_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::MEDIUM)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NEGATIVE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::NEGATIVE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NEUTRAL_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::NEUTRAL)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_POLAR_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::POLAR)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_POSITIVE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::POSITIVE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SMALL_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::SMALL)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SURFACE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::SURFACE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ALPHA_CARBON_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::ALPHA_CARBON)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_AMINO_BACKBONE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_BACKBONE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::BACKBONE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CYSTEINE_SULPHUR_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_LIGAND_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::LIGAND)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NUCLEIC_BACKBONE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SHAPELY_BACKBONE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SHAPELY_SPECIAL_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SIDECHAIN_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SIDECHAIN)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SUGAR_PHOSPHATE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ALA_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ALA)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_GLY_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLY)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_LEU_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::LEU)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SER_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::SER)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_VAL_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::VAL)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_LYS_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::LYS)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ASP_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASP)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ILE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ILE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ASN_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASN)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_GLU_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLU)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PRO_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PRO)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ARG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ARG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PHE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PHE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_GLN_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLN)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_TYR_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::TYR)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_HIS_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HIS)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_CYS_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::CYS)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_MET_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::MET)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_TRP_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::TRP)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ASX_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASX)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_GLX_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLX)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PCA_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PCA)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_HYP_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HYP)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_A_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::A)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_C_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::C)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_G_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::G)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_T_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::T)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_U_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::U)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_UPLUS_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::UPLUS)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_I_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::I)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__1MA_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_1MA)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__5MC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_5MC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_OMC_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::OMC)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__1MG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_1MG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__2MG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_2MG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_M2G_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::M2G)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__7MG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_7MG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_OMG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::OMG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_YG_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::YG)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_H2U_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::H2U)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap__5MU_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_5MU)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PSU_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PSU)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_UNK_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::UNK)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ACE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ACE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_FOR_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::FOR)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_HOH_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HOH)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_DOD_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::DOD)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SO4_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::SO4)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PO4_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PO4)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NAD_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NAD)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_COA_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::COA)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NAP_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NAP)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NDP_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NDP)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_AMINO_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::AMINO)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_AMINO_NUCLEO_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::AMINO_NUCLEO)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_COENZYME_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::COENZYME)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_ION_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::ION)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_NUCLEO_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::NUCLEO)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PROTEIN_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PROTEIN)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PURINE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PURINE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_PYRIMIDINE_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PYRIMIDINE)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_SOLVENT_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::SOLVENT)))  ;
-  return 1;
-}
-
-
-SWIGCLASS_STATIC int _wrap_WATER_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {
-  MAGIC_PPERL
-  sv_setsv(sv,SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(OpenBabel::OBResidueProperty::WATER)))  ;
-  return 1;
-}
-
-
 SWIGCLASS_STATIC int _wrap_Residue_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) {
   MAGIC_PPERL
   {
@@ -16316,6 +15406,80 @@ XS(_wrap_Point2Plane) {
 }
 
 
+XS(_wrap_Point2PlaneAngle) {
+  {
+    OpenBabel::vector3 arg1 ;
+    OpenBabel::vector3 arg2 ;
+    OpenBabel::vector3 arg3 ;
+    OpenBabel::vector3 arg4 ;
+    double result;
+    void *argp1 ;
+    int res1 = 0 ;
+    void *argp2 ;
+    int res2 = 0 ;
+    void *argp3 ;
+    int res3 = 0 ;
+    void *argp4 ;
+    int res4 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 4) || (items > 4)) {
+      SWIG_croak("Usage: Point2PlaneAngle(a,b,c,d);");
+    }
+    {
+      res1 = SWIG_ConvertPtr(ST(0), &argp1, SWIGTYPE_p_OpenBabel__vector3,  0 );
+      if (!SWIG_IsOK(res1)) {
+        SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2PlaneAngle" "', argument " "1"" of type '" "OpenBabel::vector3 const""'"); 
+      }  
+      if (!argp1) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Point2PlaneAngle" "', argument " "1"" of type '" "OpenBabel::vector3 const""'");
+      } else {
+        arg1 = *(reinterpret_cast< OpenBabel::vector3 * >(argp1));
+      }
+    }
+    {
+      res2 = SWIG_ConvertPtr(ST(1), &argp2, SWIGTYPE_p_OpenBabel__vector3,  0 );
+      if (!SWIG_IsOK(res2)) {
+        SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Point2PlaneAngle" "', argument " "2"" of type '" "OpenBabel::vector3 const""'"); 
+      }  
+      if (!argp2) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Point2PlaneAngle" "', argument " "2"" of type '" "OpenBabel::vector3 const""'");
+      } else {
+        arg2 = *(reinterpret_cast< OpenBabel::vector3 * >(argp2));
+      }
+    }
+    {
+      res3 = SWIG_ConvertPtr(ST(2), &argp3, SWIGTYPE_p_OpenBabel__vector3,  0 );
+      if (!SWIG_IsOK(res3)) {
+        SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Point2PlaneAngle" "', argument " "3"" of type '" "OpenBabel::vector3 const""'"); 
+      }  
+      if (!argp3) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Point2PlaneAngle" "', argument " "3"" of type '" "OpenBabel::vector3 const""'");
+      } else {
+        arg3 = *(reinterpret_cast< OpenBabel::vector3 * >(argp3));
+      }
+    }
+    {
+      res4 = SWIG_ConvertPtr(ST(3), &argp4, SWIGTYPE_p_OpenBabel__vector3,  0 );
+      if (!SWIG_IsOK(res4)) {
+        SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Point2PlaneAngle" "', argument " "4"" of type '" "OpenBabel::vector3 const""'"); 
+      }  
+      if (!argp4) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Point2PlaneAngle" "', argument " "4"" of type '" "OpenBabel::vector3 const""'");
+      } else {
+        arg4 = *(reinterpret_cast< OpenBabel::vector3 * >(argp4));
+      }
+    }
+    result = (double)OpenBabel::Point2PlaneAngle(arg1,arg2,arg3,arg4);
+    ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1(static_cast< double >(result)); argvi++ ;
+    XSRETURN(argvi);
+  fail:
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_Trim) {
   {
     std::string *arg1 = 0 ;
@@ -41519,7 +40683,7 @@ XS(_wrap_OBBond_GetNbrAtomIdx) {
   {
     OpenBabel::OBBond *arg1 = (OpenBabel::OBBond *) 0 ;
     OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-    int result;
+    unsigned int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     void *argp2 = 0 ;
@@ -41540,8 +40704,8 @@ XS(_wrap_OBBond_GetNbrAtomIdx) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OBBond_GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
     }
     arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-    result = (int)(arg1)->GetNbrAtomIdx(arg2);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+    result = (unsigned int)(arg1)->GetNbrAtomIdx(arg2);
+    ST(argvi) = SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(result)); argvi++ ;
     
     
     XSRETURN(argvi);
@@ -43728,7 +42892,7 @@ XS(_wrap_OBMol_GetAtom) {
     dXSARGS;
     
     if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: OBMol_GetAtom(self,int);");
+      SWIG_croak("Usage: OBMol_GetAtom(self,idx);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_OpenBabel__OBMol, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
@@ -43794,7 +42958,7 @@ XS(_wrap_OBMol_GetBond__SWIG_0) {
     dXSARGS;
     
     if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: OBMol_GetBond(self,int);");
+      SWIG_croak("Usage: OBMol_GetBond(self,idx);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_OpenBabel__OBMol, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
@@ -43835,7 +42999,7 @@ XS(_wrap_OBMol_GetBond__SWIG_1) {
     dXSARGS;
     
     if ((items < 3) || (items > 3)) {
-      SWIG_croak("Usage: OBMol_GetBond(self,int,int);");
+      SWIG_croak("Usage: OBMol_GetBond(self,a,b);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_OpenBabel__OBMol, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
@@ -76229,7 +75393,7 @@ XS(_wrap_OBMolBondIter_GetNbrAtomIdx) {
   {
     OpenBabel::OBMolBondIter *arg1 = (OpenBabel::OBMolBondIter *) 0 ;
     OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-    int result;
+    unsigned int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     void *argp2 = 0 ;
@@ -76250,8 +75414,8 @@ XS(_wrap_OBMolBondIter_GetNbrAtomIdx) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OBMolBondIter_GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
     }
     arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-    result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+    result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+    ST(argvi) = SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(result)); argvi++ ;
     
     
     XSRETURN(argvi);
@@ -85477,7 +84641,7 @@ XS(_wrap_OBAtomBondIter_GetNbrAtomIdx) {
   {
     OpenBabel::OBAtomBondIter *arg1 = (OpenBabel::OBAtomBondIter *) 0 ;
     OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-    int result;
+    unsigned int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     void *argp2 = 0 ;
@@ -85498,8 +84662,8 @@ XS(_wrap_OBAtomBondIter_GetNbrAtomIdx) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OBAtomBondIter_GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
     }
     arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-    result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+    result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+    ST(argvi) = SWIG_From_unsigned_SS_int  SWIG_PERL_CALL_ARGS_1(static_cast< unsigned int >(result)); argvi++ ;
     
     
     XSRETURN(argvi);
@@ -98128,137 +97292,7 @@ static swig_variable_info swig_variables[] = {
     { "Chemistry::OpenBabelc::VX", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VX_get,&SWIGTYPE_p_OpenBabel__vector3 },
     { "Chemistry::OpenBabelc::VY", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VY_get,&SWIGTYPE_p_OpenBabel__vector3 },
     { "Chemistry::OpenBabelc::VZ", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VZ_get,&SWIGTYPE_p_OpenBabel__vector3 },
-    { "Chemistry::OpenBabelc::UndefinedData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_UndefinedData_get,0 },
-    { "Chemistry::OpenBabelc::PairData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PairData_get,0 },
-    { "Chemistry::OpenBabelc::EnergyData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_EnergyData_get,0 },
-    { "Chemistry::OpenBabelc::CommentData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CommentData_get,0 },
-    { "Chemistry::OpenBabelc::ConformerData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ConformerData_get,0 },
-    { "Chemistry::OpenBabelc::ExternalBondData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ExternalBondData_get,0 },
-    { "Chemistry::OpenBabelc::RotamerList", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_RotamerList_get,0 },
-    { "Chemistry::OpenBabelc::VirtualBondData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VirtualBondData_get,0 },
-    { "Chemistry::OpenBabelc::RingData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_RingData_get,0 },
-    { "Chemistry::OpenBabelc::TorsionData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_TorsionData_get,0 },
-    { "Chemistry::OpenBabelc::AngleData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_AngleData_get,0 },
-    { "Chemistry::OpenBabelc::SerialNums", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SerialNums_get,0 },
-    { "Chemistry::OpenBabelc::UnitCell", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_UnitCell_get,0 },
-    { "Chemistry::OpenBabelc::SpinData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SpinData_get,0 },
-    { "Chemistry::OpenBabelc::ChargeData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ChargeData_get,0 },
-    { "Chemistry::OpenBabelc::SymmetryData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SymmetryData_get,0 },
-    { "Chemistry::OpenBabelc::ChiralData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ChiralData_get,0 },
-    { "Chemistry::OpenBabelc::OccupationData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_OccupationData_get,0 },
-    { "Chemistry::OpenBabelc::DensityData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_DensityData_get,0 },
-    { "Chemistry::OpenBabelc::ElectronicData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ElectronicData_get,0 },
-    { "Chemistry::OpenBabelc::VibrationData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VibrationData_get,0 },
-    { "Chemistry::OpenBabelc::RotationData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_RotationData_get,0 },
-    { "Chemistry::OpenBabelc::NuclearData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NuclearData_get,0 },
-    { "Chemistry::OpenBabelc::SetData", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SetData_get,0 },
-    { "Chemistry::OpenBabelc::CustomData0", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData0_get,0 },
-    { "Chemistry::OpenBabelc::CustomData1", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData1_get,0 },
-    { "Chemistry::OpenBabelc::CustomData2", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData2_get,0 },
-    { "Chemistry::OpenBabelc::CustomData3", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData3_get,0 },
-    { "Chemistry::OpenBabelc::CustomData4", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData4_get,0 },
-    { "Chemistry::OpenBabelc::CustomData5", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData5_get,0 },
-    { "Chemistry::OpenBabelc::CustomData6", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData6_get,0 },
-    { "Chemistry::OpenBabelc::CustomData7", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData7_get,0 },
-    { "Chemistry::OpenBabelc::CustomData8", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData8_get,0 },
-    { "Chemistry::OpenBabelc::CustomData9", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData9_get,0 },
-    { "Chemistry::OpenBabelc::CustomData10", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData10_get,0 },
-    { "Chemistry::OpenBabelc::CustomData11", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData11_get,0 },
-    { "Chemistry::OpenBabelc::CustomData12", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData12_get,0 },
-    { "Chemistry::OpenBabelc::CustomData13", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData13_get,0 },
-    { "Chemistry::OpenBabelc::CustomData14", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData14_get,0 },
-    { "Chemistry::OpenBabelc::CustomData15", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CustomData15_get,0 },
     { "Chemistry::OpenBabelc::obErrorLog", MAGIC_CLASS _wrap_obErrorLog_set, MAGIC_CLASS _wrap_obErrorLog_get,&SWIGTYPE_p_OpenBabel__OBMessageHandler },
-    { "Chemistry::OpenBabelc::ACIDIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ACIDIC_get,0 },
-    { "Chemistry::OpenBabelc::ACYCLIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ACYCLIC_get,0 },
-    { "Chemistry::OpenBabelc::ALIPHATIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ALIPHATIC_get,0 },
-    { "Chemistry::OpenBabelc::AROMATIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_AROMATIC_get,0 },
-    { "Chemistry::OpenBabelc::BASIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_BASIC_get,0 },
-    { "Chemistry::OpenBabelc::BURIED", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_BURIED_get,0 },
-    { "Chemistry::OpenBabelc::CHARGED", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CHARGED_get,0 },
-    { "Chemistry::OpenBabelc::CYCLIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CYCLIC_get,0 },
-    { "Chemistry::OpenBabelc::HYDROPHOBIC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_HYDROPHOBIC_get,0 },
-    { "Chemistry::OpenBabelc::LARGE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_LARGE_get,0 },
-    { "Chemistry::OpenBabelc::MEDIUM", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_MEDIUM_get,0 },
-    { "Chemistry::OpenBabelc::NEGATIVE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NEGATIVE_get,0 },
-    { "Chemistry::OpenBabelc::NEUTRAL", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NEUTRAL_get,0 },
-    { "Chemistry::OpenBabelc::POLAR", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_POLAR_get,0 },
-    { "Chemistry::OpenBabelc::POSITIVE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_POSITIVE_get,0 },
-    { "Chemistry::OpenBabelc::SMALL", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SMALL_get,0 },
-    { "Chemistry::OpenBabelc::SURFACE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SURFACE_get,0 },
-    { "Chemistry::OpenBabelc::ALPHA_CARBON", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ALPHA_CARBON_get,0 },
-    { "Chemistry::OpenBabelc::AMINO_BACKBONE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_AMINO_BACKBONE_get,0 },
-    { "Chemistry::OpenBabelc::BACKBONE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_BACKBONE_get,0 },
-    { "Chemistry::OpenBabelc::CYSTEINE_SULPHUR", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CYSTEINE_SULPHUR_get,0 },
-    { "Chemistry::OpenBabelc::LIGAND", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_LIGAND_get,0 },
-    { "Chemistry::OpenBabelc::NUCLEIC_BACKBONE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NUCLEIC_BACKBONE_get,0 },
-    { "Chemistry::OpenBabelc::SHAPELY_BACKBONE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SHAPELY_BACKBONE_get,0 },
-    { "Chemistry::OpenBabelc::SHAPELY_SPECIAL", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SHAPELY_SPECIAL_get,0 },
-    { "Chemistry::OpenBabelc::SIDECHAIN", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SIDECHAIN_get,0 },
-    { "Chemistry::OpenBabelc::SUGAR_PHOSPHATE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SUGAR_PHOSPHATE_get,0 },
-    { "Chemistry::OpenBabelc::ALA", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ALA_get,0 },
-    { "Chemistry::OpenBabelc::GLY", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_GLY_get,0 },
-    { "Chemistry::OpenBabelc::LEU", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_LEU_get,0 },
-    { "Chemistry::OpenBabelc::SER", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SER_get,0 },
-    { "Chemistry::OpenBabelc::VAL", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_VAL_get,0 },
-    { "Chemistry::OpenBabelc::LYS", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_LYS_get,0 },
-    { "Chemistry::OpenBabelc::ASP", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ASP_get,0 },
-    { "Chemistry::OpenBabelc::ILE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ILE_get,0 },
-    { "Chemistry::OpenBabelc::ASN", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ASN_get,0 },
-    { "Chemistry::OpenBabelc::GLU", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_GLU_get,0 },
-    { "Chemistry::OpenBabelc::PRO", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PRO_get,0 },
-    { "Chemistry::OpenBabelc::ARG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ARG_get,0 },
-    { "Chemistry::OpenBabelc::PHE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PHE_get,0 },
-    { "Chemistry::OpenBabelc::GLN", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_GLN_get,0 },
-    { "Chemistry::OpenBabelc::TYR", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_TYR_get,0 },
-    { "Chemistry::OpenBabelc::HIS", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_HIS_get,0 },
-    { "Chemistry::OpenBabelc::CYS", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_CYS_get,0 },
-    { "Chemistry::OpenBabelc::MET", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_MET_get,0 },
-    { "Chemistry::OpenBabelc::TRP", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_TRP_get,0 },
-    { "Chemistry::OpenBabelc::ASX", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ASX_get,0 },
-    { "Chemistry::OpenBabelc::GLX", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_GLX_get,0 },
-    { "Chemistry::OpenBabelc::PCA", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PCA_get,0 },
-    { "Chemistry::OpenBabelc::HYP", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_HYP_get,0 },
-    { "Chemistry::OpenBabelc::A", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_A_get,0 },
-    { "Chemistry::OpenBabelc::C", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_C_get,0 },
-    { "Chemistry::OpenBabelc::G", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_G_get,0 },
-    { "Chemistry::OpenBabelc::T", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_T_get,0 },
-    { "Chemistry::OpenBabelc::U", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_U_get,0 },
-    { "Chemistry::OpenBabelc::UPLUS", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_UPLUS_get,0 },
-    { "Chemistry::OpenBabelc::I", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_I_get,0 },
-    { "Chemistry::OpenBabelc::_1MA", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__1MA_get,0 },
-    { "Chemistry::OpenBabelc::_5MC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__5MC_get,0 },
-    { "Chemistry::OpenBabelc::OMC", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_OMC_get,0 },
-    { "Chemistry::OpenBabelc::_1MG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__1MG_get,0 },
-    { "Chemistry::OpenBabelc::_2MG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__2MG_get,0 },
-    { "Chemistry::OpenBabelc::M2G", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_M2G_get,0 },
-    { "Chemistry::OpenBabelc::_7MG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__7MG_get,0 },
-    { "Chemistry::OpenBabelc::OMG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_OMG_get,0 },
-    { "Chemistry::OpenBabelc::YG", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_YG_get,0 },
-    { "Chemistry::OpenBabelc::H2U", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_H2U_get,0 },
-    { "Chemistry::OpenBabelc::_5MU", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap__5MU_get,0 },
-    { "Chemistry::OpenBabelc::PSU", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PSU_get,0 },
-    { "Chemistry::OpenBabelc::UNK", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_UNK_get,0 },
-    { "Chemistry::OpenBabelc::ACE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ACE_get,0 },
-    { "Chemistry::OpenBabelc::FOR", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_FOR_get,0 },
-    { "Chemistry::OpenBabelc::HOH", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_HOH_get,0 },
-    { "Chemistry::OpenBabelc::DOD", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_DOD_get,0 },
-    { "Chemistry::OpenBabelc::SO4", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SO4_get,0 },
-    { "Chemistry::OpenBabelc::PO4", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PO4_get,0 },
-    { "Chemistry::OpenBabelc::NAD", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NAD_get,0 },
-    { "Chemistry::OpenBabelc::COA", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_COA_get,0 },
-    { "Chemistry::OpenBabelc::NAP", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NAP_get,0 },
-    { "Chemistry::OpenBabelc::NDP", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NDP_get,0 },
-    { "Chemistry::OpenBabelc::AMINO", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_AMINO_get,0 },
-    { "Chemistry::OpenBabelc::AMINO_NUCLEO", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_AMINO_NUCLEO_get,0 },
-    { "Chemistry::OpenBabelc::COENZYME", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_COENZYME_get,0 },
-    { "Chemistry::OpenBabelc::ION", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_ION_get,0 },
-    { "Chemistry::OpenBabelc::NUCLEO", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_NUCLEO_get,0 },
-    { "Chemistry::OpenBabelc::PROTEIN", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PROTEIN_get,0 },
-    { "Chemistry::OpenBabelc::PURINE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PURINE_get,0 },
-    { "Chemistry::OpenBabelc::PYRIMIDINE", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_PYRIMIDINE_get,0 },
-    { "Chemistry::OpenBabelc::SOLVENT", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_SOLVENT_get,0 },
-    { "Chemistry::OpenBabelc::WATER", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS _wrap_WATER_get,0 },
     { "Chemistry::OpenBabelc::Residue", MAGIC_CLASS _wrap_Residue_set, MAGIC_CLASS _wrap_Residue_get,&SWIGTYPE_p_a_4__char },
     { "Chemistry::OpenBabelc::ElemDesc", MAGIC_CLASS _wrap_ElemDesc_set, MAGIC_CLASS _wrap_ElemDesc_get,&SWIGTYPE_p_a_4__char },
     { "Chemistry::OpenBabelc::ResNo", MAGIC_CLASS _wrap_ResNo_set, MAGIC_CLASS _wrap_ResNo_get,0 },
@@ -98481,6 +97515,7 @@ static swig_command_info swig_commands[] = {
 {"Chemistry::OpenBabelc::vectorAngle", _wrap_vectorAngle},
 {"Chemistry::OpenBabelc::CalcTorsionAngle", _wrap_CalcTorsionAngle},
 {"Chemistry::OpenBabelc::Point2Plane", _wrap_Point2Plane},
+{"Chemistry::OpenBabelc::Point2PlaneAngle", _wrap_Point2PlaneAngle},
 {"Chemistry::OpenBabelc::Trim", _wrap_Trim},
 {"Chemistry::OpenBabelc::new_OBGenericData", _wrap_new_OBGenericData},
 {"Chemistry::OpenBabelc::OBGenericData_Clone", _wrap_OBGenericData_Clone},
@@ -100538,6 +99573,206 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_OpenBabel__vector3, (void*) "Chemistry::OpenBabel::vector3");
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "UndefinedData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::UndefinedData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PairData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::PairData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "EnergyData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::EnergyData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CommentData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CommentData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ConformerData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::ConformerData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ExternalBondData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::ExternalBondData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "RotamerList", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::RotamerList)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "VirtualBondData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::VirtualBondData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "RingData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::RingData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "TorsionData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::TorsionData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "AngleData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::AngleData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SerialNums", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::SerialNums)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "UnitCell", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::UnitCell)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SpinData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::SpinData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ChargeData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::ChargeData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SymmetryData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::SymmetryData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ChiralData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::ChiralData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "OccupationData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::OccupationData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "DensityData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::DensityData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ElectronicData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::ElectronicData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "VibrationData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::VibrationData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "RotationData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::RotationData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NuclearData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::NuclearData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SetData", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::SetData)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData0", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData0)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData1", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData1)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData2", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData2)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData3", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData3)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData4", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData4)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData5", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData5)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData6", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData6)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData7", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData7)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData8", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData8)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData9", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData9)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData10", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData10)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData11", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData11)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData12", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData12)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData13", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData13)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData14", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData14)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CustomData15", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBGenericDataType::CustomData15)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
   /*@SWIG:%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "any", TRUE | 0x2);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::any)));
@@ -100854,6 +100089,456 @@ XS(SWIG_init) {
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >((1 << 20))));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ACIDIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::ACIDIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ACYCLIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::ACYCLIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ALIPHATIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::ALIPHATIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "AROMATIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::AROMATIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "BASIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::BASIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "BURIED", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::BURIED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CHARGED", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::CHARGED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CYCLIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::CYCLIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "HYDROPHOBIC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::HYDROPHOBIC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "LARGE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::LARGE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "MEDIUM", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::MEDIUM)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NEGATIVE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::NEGATIVE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NEUTRAL", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::NEUTRAL)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "POLAR", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::POLAR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "POSITIVE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::POSITIVE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SMALL", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::SMALL)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SURFACE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBAminoAcidProperty::SURFACE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ALPHA_CARBON", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::ALPHA_CARBON)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "AMINO_BACKBONE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "BACKBONE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::BACKBONE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CYSTEINE_SULPHUR", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "LIGAND", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::LIGAND)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NUCLEIC_BACKBONE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SHAPELY_BACKBONE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SHAPELY_SPECIAL", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SIDECHAIN", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::SIDECHAIN)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SUGAR_PHOSPHATE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ALA", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ALA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "GLY", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::GLY)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "LEU", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::LEU)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SER", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::SER)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "VAL", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::VAL)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "LYS", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::LYS)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ASP", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ASP)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ILE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ILE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ASN", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ASN)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "GLU", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::GLU)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PRO", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::PRO)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ARG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ARG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PHE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::PHE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "GLN", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::GLN)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "TYR", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::TYR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "HIS", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::HIS)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "CYS", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::CYS)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "MET", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::MET)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "TRP", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::TRP)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ASX", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ASX)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "GLX", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::GLX)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PCA", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::PCA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "HYP", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::HYP)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "A", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::A)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "C", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::C)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "G", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::G)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "T", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::T)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "U", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::U)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "UPLUS", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::UPLUS)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "I", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::I)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_1MA", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_1MA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_5MC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_5MC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "OMC", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::OMC)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_1MG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_1MG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_2MG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_2MG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "M2G", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::M2G)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_7MG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_7MG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "OMG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::OMG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "YG", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::YG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "H2U", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::H2U)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "_5MU", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::_5MU)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PSU", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::PSU)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "UNK", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::UNK)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ACE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::ACE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "FOR", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::FOR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "HOH", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::HOH)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "DOD", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::DOD)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SO4", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::SO4)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PO4", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::PO4)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NAD", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::NAD)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "COA", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::COA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NAP", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::NAP)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NDP", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueIndex::NDP)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "AMINO", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::AMINO)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "AMINO_NUCLEO", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::AMINO_NUCLEO)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "COENZYME", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::COENZYME)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "ION", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::ION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "NUCLEO", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::NUCLEO)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PROTEIN", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::PROTEIN)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PURINE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::PURINE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "PYRIMIDINE", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::PYRIMIDINE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SOLVENT", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::SOLVENT)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "WATER", TRUE | 0x2);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(OpenBabel::OBResidueProperty::WATER)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_OpenBabel__OBInternalCoord, (void*) "Chemistry::OpenBabel::OBInternalCoord");
   /*@SWIG:%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "OB_4RING_ATOM", TRUE | 0x2);
diff --git a/scripts/ruby/openbabel_ruby.cpp b/scripts/ruby/openbabel_ruby.cpp
index 4bf12dc08..a765bfeaf 100644
--- a/scripts/ruby/openbabel_ruby.cpp
+++ b/scripts/ruby/openbabel_ruby.cpp
@@ -1609,82 +1609,83 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 #define SWIGTYPE_p_OpenBabel__OBUnitCell swig_types[65]
 #define SWIGTYPE_p_OpenBabel__OBVirtualBond swig_types[66]
 #define SWIGTYPE_p_OpenBabel__Pattern swig_types[67]
-#define SWIGTYPE_p_OpenBabel__Template swig_types[68]
-#define SWIGTYPE_p_OpenBabel__matrix3x3 swig_types[69]
-#define SWIGTYPE_p_OpenBabel__obLogBuf swig_types[70]
-#define SWIGTYPE_p_OpenBabel__quadTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[71]
-#define SWIGTYPE_p_OpenBabel__tripleTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[72]
-#define SWIGTYPE_p_OpenBabel__vector3 swig_types[73]
-#define SWIGTYPE_p_a_3__double swig_types[74]
-#define SWIGTYPE_p_a_4__char swig_types[75]
-#define SWIGTYPE_p_char swig_types[76]
-#define SWIGTYPE_p_double swig_types[77]
-#define SWIGTYPE_p_int swig_types[78]
-#define SWIGTYPE_p_p_OpenBabel__OBAngleData swig_types[79]
-#define SWIGTYPE_p_p_OpenBabel__OBChiralData swig_types[80]
-#define SWIGTYPE_p_p_OpenBabel__OBCommentData swig_types[81]
-#define SWIGTYPE_p_p_OpenBabel__OBConformerData swig_types[82]
-#define SWIGTYPE_p_p_OpenBabel__OBExternalBondData swig_types[83]
-#define SWIGTYPE_p_p_OpenBabel__OBFormat swig_types[84]
-#define SWIGTYPE_p_p_OpenBabel__OBGenericData swig_types[85]
-#define SWIGTYPE_p_p_OpenBabel__OBPairData swig_types[86]
-#define SWIGTYPE_p_p_OpenBabel__OBRingData swig_types[87]
-#define SWIGTYPE_p_p_OpenBabel__OBSerialNums swig_types[88]
-#define SWIGTYPE_p_p_OpenBabel__OBSetData swig_types[89]
-#define SWIGTYPE_p_p_OpenBabel__OBSymmetryData swig_types[90]
-#define SWIGTYPE_p_p_OpenBabel__OBTorsionData swig_types[91]
-#define SWIGTYPE_p_p_OpenBabel__OBUnitCell swig_types[92]
-#define SWIGTYPE_p_p_OpenBabel__OBVirtualBond swig_types[93]
-#define SWIGTYPE_p_p_double swig_types[94]
-#define SWIGTYPE_p_p_int swig_types[95]
-#define SWIGTYPE_p_std__dequeTint_t swig_types[96]
-#define SWIGTYPE_p_std__ifstream swig_types[97]
-#define SWIGTYPE_p_std__istream swig_types[98]
-#define SWIGTYPE_p_std__mapTchar_const_p_OpenBabel__OBFormat_p_OpenBabel__CharPtrLess_t swig_types[99]
-#define SWIGTYPE_p_std__mapTint_OpenBabel__OBAtom_p_t swig_types[100]
-#define SWIGTYPE_p_std__mapTstd__string_std__string_t swig_types[101]
-#define SWIGTYPE_p_std__multimapTdouble_unsigned_int_t swig_types[102]
-#define SWIGTYPE_p_std__ostream swig_types[103]
-#define SWIGTYPE_p_std__out_of_range swig_types[104]
-#define SWIGTYPE_p_std__pairTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[105]
-#define SWIGTYPE_p_std__streampos swig_types[106]
-#define SWIGTYPE_p_std__string swig_types[107]
-#define SWIGTYPE_p_std__type_info swig_types[108]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBAtom_p_t swig_types[109]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBAtom_p_t__iterator swig_types[110]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_p_t swig_types[111]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_p_t__iterator swig_types[112]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_t swig_types[113]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBExternalBond_t swig_types[114]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBGenericData_p_t swig_types[115]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBGenericData_p_t__iterator swig_types[116]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBInternalCoord_p_t swig_types[117]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBInternalCoord_p_t__iterator swig_types[118]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBMol_t swig_types[119]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBResidue_p_t__iterator swig_types[120]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBResidue_t swig_types[121]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_p_t swig_types[122]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_p_t__iterator swig_types[123]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_t swig_types[124]
-#define SWIGTYPE_p_std__vectorTOpenBabel__OBTorsion_t swig_types[125]
-#define SWIGTYPE_p_std__vectorTOpenBabel__tripleTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_double_t_t swig_types[126]
-#define SWIGTYPE_p_std__vectorTOpenBabel__vector3_t swig_types[127]
-#define SWIGTYPE_p_std__vectorTdouble_p_t swig_types[128]
-#define SWIGTYPE_p_std__vectorTdouble_p_t__iterator swig_types[129]
-#define SWIGTYPE_p_std__vectorTdouble_t swig_types[130]
-#define SWIGTYPE_p_std__vectorTint_t swig_types[131]
-#define SWIGTYPE_p_std__vectorTstd__pairTint_int_t_t swig_types[132]
-#define SWIGTYPE_p_std__vectorTstd__pairTstd__string_std__string_t_t swig_types[133]
-#define SWIGTYPE_p_std__vectorTstd__string_t swig_types[134]
-#define SWIGTYPE_p_std__vectorTstd__vectorTOpenBabel__vector3_t_t swig_types[135]
-#define SWIGTYPE_p_std__vectorTstd__vectorTint_t_t swig_types[136]
-#define SWIGTYPE_p_std__vectorTstd__vectorTint_t_t__iterator swig_types[137]
-#define SWIGTYPE_p_std__vectorTstd__vectorTunsigned_int_t_t swig_types[138]
-#define SWIGTYPE_p_std__vectorTunsigned_int_t swig_types[139]
-#define SWIGTYPE_p_std__vectorTunsigned_short_t swig_types[140]
-#define SWIGTYPE_p_unsigned_int swig_types[141]
-static swig_type_info *swig_types[143];
-static swig_module_info swig_module = {swig_types, 142, 0, 0, 0, 0};
+#define SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t swig_types[68]
+#define SWIGTYPE_p_OpenBabel__Template swig_types[69]
+#define SWIGTYPE_p_OpenBabel__matrix3x3 swig_types[70]
+#define SWIGTYPE_p_OpenBabel__obLogBuf swig_types[71]
+#define SWIGTYPE_p_OpenBabel__quadTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[72]
+#define SWIGTYPE_p_OpenBabel__tripleTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[73]
+#define SWIGTYPE_p_OpenBabel__vector3 swig_types[74]
+#define SWIGTYPE_p_a_3__double swig_types[75]
+#define SWIGTYPE_p_a_4__char swig_types[76]
+#define SWIGTYPE_p_char swig_types[77]
+#define SWIGTYPE_p_double swig_types[78]
+#define SWIGTYPE_p_int swig_types[79]
+#define SWIGTYPE_p_p_OpenBabel__OBAngleData swig_types[80]
+#define SWIGTYPE_p_p_OpenBabel__OBChiralData swig_types[81]
+#define SWIGTYPE_p_p_OpenBabel__OBCommentData swig_types[82]
+#define SWIGTYPE_p_p_OpenBabel__OBConformerData swig_types[83]
+#define SWIGTYPE_p_p_OpenBabel__OBExternalBondData swig_types[84]
+#define SWIGTYPE_p_p_OpenBabel__OBFormat swig_types[85]
+#define SWIGTYPE_p_p_OpenBabel__OBGenericData swig_types[86]
+#define SWIGTYPE_p_p_OpenBabel__OBPairData swig_types[87]
+#define SWIGTYPE_p_p_OpenBabel__OBRingData swig_types[88]
+#define SWIGTYPE_p_p_OpenBabel__OBSerialNums swig_types[89]
+#define SWIGTYPE_p_p_OpenBabel__OBSetData swig_types[90]
+#define SWIGTYPE_p_p_OpenBabel__OBSymmetryData swig_types[91]
+#define SWIGTYPE_p_p_OpenBabel__OBTorsionData swig_types[92]
+#define SWIGTYPE_p_p_OpenBabel__OBUnitCell swig_types[93]
+#define SWIGTYPE_p_p_OpenBabel__OBVirtualBond swig_types[94]
+#define SWIGTYPE_p_p_double swig_types[95]
+#define SWIGTYPE_p_p_int swig_types[96]
+#define SWIGTYPE_p_std__dequeTint_t swig_types[97]
+#define SWIGTYPE_p_std__ifstream swig_types[98]
+#define SWIGTYPE_p_std__istream swig_types[99]
+#define SWIGTYPE_p_std__mapTchar_const_p_OpenBabel__OBFormat_p_OpenBabel__CharPtrLess_t swig_types[100]
+#define SWIGTYPE_p_std__mapTint_OpenBabel__OBAtom_p_t swig_types[101]
+#define SWIGTYPE_p_std__mapTstd__string_std__string_t swig_types[102]
+#define SWIGTYPE_p_std__multimapTdouble_unsigned_int_t swig_types[103]
+#define SWIGTYPE_p_std__ostream swig_types[104]
+#define SWIGTYPE_p_std__out_of_range swig_types[105]
+#define SWIGTYPE_p_std__pairTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_t swig_types[106]
+#define SWIGTYPE_p_std__streampos swig_types[107]
+#define SWIGTYPE_p_std__string swig_types[108]
+#define SWIGTYPE_p_std__type_info swig_types[109]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBAtom_p_t swig_types[110]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBAtom_p_t__iterator swig_types[111]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_p_t swig_types[112]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_p_t__iterator swig_types[113]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBBond_t swig_types[114]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBExternalBond_t swig_types[115]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBGenericData_p_t swig_types[116]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBGenericData_p_t__iterator swig_types[117]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBInternalCoord_p_t swig_types[118]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBInternalCoord_p_t__iterator swig_types[119]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBMol_t swig_types[120]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBResidue_p_t__iterator swig_types[121]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBResidue_t swig_types[122]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_p_t swig_types[123]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_p_t__iterator swig_types[124]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBRing_t swig_types[125]
+#define SWIGTYPE_p_std__vectorTOpenBabel__OBTorsion_t swig_types[126]
+#define SWIGTYPE_p_std__vectorTOpenBabel__tripleTOpenBabel__OBAtom_p_OpenBabel__OBAtom_p_double_t_t swig_types[127]
+#define SWIGTYPE_p_std__vectorTOpenBabel__vector3_t swig_types[128]
+#define SWIGTYPE_p_std__vectorTdouble_p_t swig_types[129]
+#define SWIGTYPE_p_std__vectorTdouble_p_t__iterator swig_types[130]
+#define SWIGTYPE_p_std__vectorTdouble_t swig_types[131]
+#define SWIGTYPE_p_std__vectorTint_t swig_types[132]
+#define SWIGTYPE_p_std__vectorTstd__pairTint_int_t_t swig_types[133]
+#define SWIGTYPE_p_std__vectorTstd__pairTstd__string_std__string_t_t swig_types[134]
+#define SWIGTYPE_p_std__vectorTstd__string_t swig_types[135]
+#define SWIGTYPE_p_std__vectorTstd__vectorTOpenBabel__vector3_t_t swig_types[136]
+#define SWIGTYPE_p_std__vectorTstd__vectorTint_t_t swig_types[137]
+#define SWIGTYPE_p_std__vectorTstd__vectorTint_t_t__iterator swig_types[138]
+#define SWIGTYPE_p_std__vectorTstd__vectorTunsigned_int_t_t swig_types[139]
+#define SWIGTYPE_p_std__vectorTunsigned_int_t swig_types[140]
+#define SWIGTYPE_p_std__vectorTunsigned_short_t swig_types[141]
+#define SWIGTYPE_p_unsigned_int swig_types[142]
+static swig_type_info *swig_types[144];
+static swig_module_info swig_module = {swig_types, 143, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1729,7 +1730,7 @@ static VALUE mOpenbabel;
 #include <openbabel/ring.h>
 #include <openbabel/obconversion.h>
 #include <openbabel/oberror.h>
-
+#include <openbabel/pluginiter.h>
 #include <openbabel/fingerprint.h>
 
 #include <openbabel/data.h>
@@ -12235,6 +12236,78 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Point2PlaneAngle(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::vector3 arg1 ;
+  OpenBabel::vector3 arg2 ;
+  OpenBabel::vector3 arg3 ;
+  OpenBabel::vector3 arg4 ;
+  double result;
+  void *argp1 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  void *argp4 ;
+  int res4 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_OpenBabel__vector3,  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "1"" of type '" "OpenBabel::vector3 const""'"); 
+    }  
+    if (!argp1) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "1"" of type '" "OpenBabel::vector3 const""'");
+    } else {
+      arg1 = *(reinterpret_cast< OpenBabel::vector3 * >(argp1));
+    }
+  }
+  {
+    res2 = SWIG_ConvertPtr(argv[1], &argp2, SWIGTYPE_p_OpenBabel__vector3,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "2"" of type '" "OpenBabel::vector3 const""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "2"" of type '" "OpenBabel::vector3 const""'");
+    } else {
+      arg2 = *(reinterpret_cast< OpenBabel::vector3 * >(argp2));
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(argv[2], &argp3, SWIGTYPE_p_OpenBabel__vector3,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "3"" of type '" "OpenBabel::vector3 const""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "3"" of type '" "OpenBabel::vector3 const""'");
+    } else {
+      arg3 = *(reinterpret_cast< OpenBabel::vector3 * >(argp3));
+    }
+  }
+  {
+    res4 = SWIG_ConvertPtr(argv[3], &argp4, SWIGTYPE_p_OpenBabel__vector3,  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "4"" of type '" "OpenBabel::vector3 const""'"); 
+    }  
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OpenBabel::Point2PlaneAngle" "', argument " "4"" of type '" "OpenBabel::vector3 const""'");
+    } else {
+      arg4 = *(reinterpret_cast< OpenBabel::vector3 * >(argp4));
+    }
+  }
+  result = (double)OpenBabel::Point2PlaneAngle(arg1,arg2,arg3,arg4);
+  vresult = SWIG_From_double(static_cast< double >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 VZero_get(VALUE self) {
   VALUE _val;
@@ -12301,366 +12374,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-UndefinedData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::UndefinedData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PairData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::PairData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-EnergyData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::EnergyData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CommentData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CommentData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ConformerData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ConformerData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ExternalBondData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ExternalBondData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-RotamerList_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RotamerList));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-VirtualBondData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::VirtualBondData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-RingData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RingData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-TorsionData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::TorsionData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-AngleData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::AngleData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SerialNums_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SerialNums));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-UnitCell_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::UnitCell));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SpinData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SpinData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ChargeData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ChargeData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SymmetryData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SymmetryData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ChiralData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ChiralData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-OccupationData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::OccupationData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-DensityData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::DensityData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ElectronicData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::ElectronicData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-VibrationData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::VibrationData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-RotationData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::RotationData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NuclearData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::NuclearData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SetData_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::SetData));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData0_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData0));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData1_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData1));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData2_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData2));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData3_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData3));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData4_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData4));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData5_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData5));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData6_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData6));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData7_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData7));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData8_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData8));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData9_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData9));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData10_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData10));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData11_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData11));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData12_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData12));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData13_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData13));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData14_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData14));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CustomData15_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBGenericDataType::CustomData15));
-  return _val;
-}
-
-
 swig_class cOBGenericData;
 
 SWIGINTERN VALUE
@@ -19525,6 +19238,914 @@ fail:
 }
 
 
+swig_class cPluginiterFingerprint;
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Register(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBFingerprint *arg2 = (OpenBabel::OBFingerprint *) 0 ;
+  std::string arg3 ;
+  bool arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Register" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Register" "', argument " "2"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg2 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp2);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(argv[1], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Register" "', argument " "3"" of type '" "std::string const""'"); 
+    }
+    arg3 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode4 = SWIG_AsVal_bool(argv[2], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Register" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  (arg1)->Register(arg2,arg3,arg4);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_FindType(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::string *arg2 = 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindType" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    std::string *ptr = (std::string *)0;
+    res2 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FindType" "', argument " "2"" of type '" "std::string const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FindType" "', argument " "2"" of type '" "std::string const &""'"); 
+    }
+    arg2 = ptr;
+  }
+  result = (OpenBabel::OBFingerprint *)(arg1)->FindType((std::string const &)*arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return vresult;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_FindDefaultType(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindDefaultType" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = (OpenBabel::OBFingerprint *)((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->FindDefaultType();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_ID(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ID" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = ((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->ID();
+  vresult = SWIG_From_std_string(static_cast< std::string >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Description(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Description" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = ((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->Description();
+  vresult = SWIG_From_std_string(static_cast< std::string >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_ToStart(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToStart" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  (arg1)->ToStart();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_inc(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "operator ++" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    OpenBabel::PluginIter<OpenBabel::OBFingerprint > &_result_ref = (arg1)->operator ++();
+    result = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) &_result_ref;
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_good(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "operator bool" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = (bool)((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->operator bool();
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_deref(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "operator ->" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = (OpenBabel::OBFingerprint *)((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->operator ->();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint___ref__(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "operator *" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    OpenBabel::OBFingerprint &_result_ref = ((OpenBabel::PluginIter<OpenBabel::OBFingerprint > const *)arg1)->operator *();
+    result = (OpenBabel::OBFingerprint *) &_result_ref;
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_allocate(VALUE self) {
+#else
+  SWIGINTERN VALUE
+  _wrap_pluginiterFingerprint_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    
+    
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+  
+
+SWIGINTERN VALUE
+_wrap_new_pluginiterFingerprint(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *result = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *)new OpenBabel::PluginIter<OpenBabel::OBFingerprint >();DATA_PTR(self) = result;
+  
+  return self;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN void
+free_OpenBabel_PluginIter_Sl_OpenBabel_OBFingerprint_Sg_(OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1) {
+    delete arg1;
+}
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Iter(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Iter" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    OpenBabel::PluginIter<OpenBabel::OBFingerprint > &_result_ref = (*arg1)->Iter();
+    result = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) &_result_ref;
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_SetBit(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetBit" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SetBit" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SetBit" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int > * >(argp2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SetBit" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  (*arg1)->SetBit(*arg2,arg3);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Fold(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Fold" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Fold" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Fold" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int > * >(argp2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Fold" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  (*arg1)->Fold(*arg2,arg3);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_GetFingerprint__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBBase *arg2 = (OpenBabel::OBBase *) 0 ;
+  std::vector<unsigned int > *arg3 = 0 ;
+  int arg4 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFingerprint" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OpenBabel__OBBase, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetFingerprint" "', argument " "2"" of type '" "OpenBabel::OBBase *""'"); 
+  }
+  arg2 = reinterpret_cast< OpenBabel::OBBase * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<unsigned int > * >(argp3);
+  ecode4 = SWIG_AsVal_int(argv[2], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GetFingerprint" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  result = (bool)(*arg1)->GetFingerprint(arg2,*arg3,arg4);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_GetFingerprint__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  OpenBabel::OBBase *arg2 = (OpenBabel::OBBase *) 0 ;
+  std::vector<unsigned int > *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFingerprint" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OpenBabel__OBBase, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetFingerprint" "', argument " "2"" of type '" "OpenBabel::OBBase *""'"); 
+  }
+  arg2 = reinterpret_cast< OpenBabel::OBBase * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<unsigned int > * >(argp3);
+  result = (bool)(*arg1)->GetFingerprint(arg2,*arg3);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_pluginiterFingerprint_GetFingerprint(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[5];
+  int ii;
+  
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 5) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_OpenBabel__OBBase, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_t, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_pluginiterFingerprint_GetFingerprint__SWIG_1(nargs, args, self);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_OpenBabel__OBBase, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_t, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_pluginiterFingerprint_GetFingerprint__SWIG_0(nargs, args, self);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'pluginiterFingerprint_GetFingerprint'");
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Flags(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Flags" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = (unsigned int)(*arg1)->Flags();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Tanimoto__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  std::vector<unsigned int > *arg3 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector<unsigned int > temp2 ;
+  std::vector<unsigned int > temp3 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Tanimoto" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[0]);
+      temp2 = std::vector<unsigned int >(size);
+      arg2 = &temp2;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[0])[i];
+        if (FIXNUM_P(o))
+        temp2[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  {
+    if (rb_obj_is_kind_of(argv[1],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[1]);
+      temp3 = std::vector<unsigned int >(size);
+      arg3 = &temp3;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[1])[i];
+        if (FIXNUM_P(o))
+        temp3[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  result = (double)(*arg1)->Tanimoto((std::vector<unsigned int > const &)*arg2,(std::vector<unsigned int > const &)*arg3);
+  vresult = SWIG_From_double(static_cast< double >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Tanimoto__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  unsigned int *arg3 = (unsigned int *) 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector<unsigned int > temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Tanimoto" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[0]);
+      temp2 = std::vector<unsigned int >(size);
+      arg2 = &temp2;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[0])[i];
+        if (FIXNUM_P(o))
+        temp2[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_unsigned_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Tanimoto" "', argument " "3"" of type '" "unsigned int const *""'"); 
+  }
+  arg3 = reinterpret_cast< unsigned int * >(argp3);
+  result = (double)(*arg1)->Tanimoto((std::vector<unsigned int > const &)*arg2,(unsigned int const *)arg3);
+  vresult = SWIG_From_double(static_cast< double >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_pluginiterFingerprint_Tanimoto(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[4];
+  int ii;
+  
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 4) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        /* native sequence? */
+        if (rb_obj_is_kind_of(argv[1],rb_cArray)) {
+          unsigned int size = RARRAY_LEN(argv[1]);
+          if (size == 0) {
+            /* an empty sequence can be of any type */
+            _v = 1;
+          } else {
+            /* check the first element only */
+            VALUE o = RARRAY_PTR(argv[1])[0];
+            if (FIXNUM_P(o))
+            _v = 1;
+            else
+            _v = 0;
+          }
+        } else {
+          /* wrapped vector? */
+          std::vector<unsigned int >* v;
+          if (SWIG_ConvertPtr(argv[1],(void **) &v, 
+              SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+          _v = 1;
+          else
+          _v = 0;
+        }
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_unsigned_int, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_pluginiterFingerprint_Tanimoto__SWIG_1(nargs, args, self);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        /* native sequence? */
+        if (rb_obj_is_kind_of(argv[1],rb_cArray)) {
+          unsigned int size = RARRAY_LEN(argv[1]);
+          if (size == 0) {
+            /* an empty sequence can be of any type */
+            _v = 1;
+          } else {
+            /* check the first element only */
+            VALUE o = RARRAY_PTR(argv[1])[0];
+            if (FIXNUM_P(o))
+            _v = 1;
+            else
+            _v = 0;
+          }
+        } else {
+          /* wrapped vector? */
+          std::vector<unsigned int >* v;
+          if (SWIG_ConvertPtr(argv[1],(void **) &v, 
+              SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+          _v = 1;
+          else
+          _v = 0;
+        }
+      }
+      if (_v) {
+        {
+          /* native sequence? */
+          if (rb_obj_is_kind_of(argv[2],rb_cArray)) {
+            unsigned int size = RARRAY_LEN(argv[2]);
+            if (size == 0) {
+              /* an empty sequence can be of any type */
+              _v = 1;
+            } else {
+              /* check the first element only */
+              VALUE o = RARRAY_PTR(argv[2])[0];
+              if (FIXNUM_P(o))
+              _v = 1;
+              else
+              _v = 0;
+            }
+          } else {
+            /* wrapped vector? */
+            std::vector<unsigned int >* v;
+            if (SWIG_ConvertPtr(argv[2],(void **) &v, 
+                SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+            _v = 1;
+            else
+            _v = 0;
+          }
+        }
+        if (_v) {
+          return _wrap_pluginiterFingerprint_Tanimoto__SWIG_0(nargs, args, self);
+        }
+      }
+    }
+  }
+  
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'pluginiterFingerprint_Tanimoto'");
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_Getbitsperint(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Getbitsperint" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  result = (unsigned int)(*arg1)->Getbitsperint();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pluginiterFingerprint_FindFingerprint(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *arg1 = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) 0 ;
+  std::string *arg2 = 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindFingerprint" "', argument " "1"" of type '" "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::PluginIter<OpenBabel::OBFingerprint > * >(argp1);
+  {
+    std::string *ptr = (std::string *)0;
+    res2 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FindFingerprint" "', argument " "2"" of type '" "std::string const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FindFingerprint" "', argument " "2"" of type '" "std::string const &""'"); 
+    }
+    arg2 = ptr;
+  }
+  result = (OpenBabel::OBFingerprint *)(*arg1)->FindFingerprint((std::string const &)*arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return vresult;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+}
+
+
 swig_class cOBError;
 
 SWIGINTERN VALUE
@@ -25659,825 +26280,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-ACIDIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ACIDIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ACYCLIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ACYCLIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ALIPHATIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::ALIPHATIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-AROMATIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::AROMATIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-BASIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::BASIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-BURIED_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::BURIED));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CHARGED_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::CHARGED));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CYCLIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::CYCLIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-HYDROPHOBIC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::HYDROPHOBIC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-LARGE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::LARGE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-MEDIUM_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::MEDIUM));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NEGATIVE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::NEGATIVE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NEUTRAL_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::NEUTRAL));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-POLAR_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::POLAR));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-POSITIVE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::POSITIVE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SMALL_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::SMALL));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SURFACE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBAminoAcidProperty::SURFACE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ALPHA_CARBON_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::ALPHA_CARBON));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-AMINO_BACKBONE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-BACKBONE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::BACKBONE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CYSTEINE_SULPHUR_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-LIGAND_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::LIGAND));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NUCLEIC_BACKBONE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SHAPELY_BACKBONE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SHAPELY_SPECIAL_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SIDECHAIN_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SIDECHAIN));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SUGAR_PHOSPHATE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ALA_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ALA));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-GLY_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLY));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-LEU_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::LEU));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SER_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::SER));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-VAL_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::VAL));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-THR_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::THR));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-LYS_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::LYS));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ASP_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASP));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ILE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ILE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ASN_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASN));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-GLU_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLU));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PRO_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PRO));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ARG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ARG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PHE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PHE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-GLN_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLN));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-TYR_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::TYR));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-HIS_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HIS));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-CYS_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::CYS));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-MET_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::MET));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-TRP_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::TRP));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ASX_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ASX));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-GLX_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::GLX));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PCA_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PCA));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-HYP_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HYP));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-A_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::A));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-C_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::C));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-G_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::G));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-T_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::T));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-U_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::U));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-UPLUS_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::UPLUS));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-I_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::I));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_1MA_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_1MA));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_5MC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_5MC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-OMC_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::OMC));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_1MG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_1MG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_2MG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_2MG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-M2G_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::M2G));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_7MG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_7MG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-OMG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::OMG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-YG_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::YG));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-H2U_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::H2U));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_5MU_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::_5MU));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PSU_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PSU));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-UNK_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::UNK));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ACE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::ACE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-FOR_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::FOR));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-HOH_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::HOH));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-DOD_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::DOD));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SO4_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::SO4));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PO4_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::PO4));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NAD_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NAD));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-COA_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::COA));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NAP_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NAP));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NDP_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueIndex::NDP));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-AMINO_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::AMINO));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-AMINO_NUCLEO_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::AMINO_NUCLEO));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-COENZYME_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::COENZYME));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-ION_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::ION));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-NUCLEO_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::NUCLEO));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PROTEIN_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PROTEIN));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PURINE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PURINE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-PYRIMIDINE_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::PYRIMIDINE));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-SOLVENT_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::SOLVENT));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-WATER_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(OpenBabel::OBResidueProperty::WATER));
-  return _val;
-}
-
-
 SWIGINTERN VALUE
 Residue_get(VALUE self) {
   VALUE _val;
@@ -32252,7 +32054,7 @@ SWIGINTERN VALUE
 _wrap_OBBond_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
   OpenBabel::OBBond *arg1 = (OpenBabel::OBBond *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -32272,8 +32074,8 @@ _wrap_OBBond_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
   }
   arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-  result = (int)(arg1)->GetNbrAtomIdx(arg2);
-  vresult = SWIG_From_int(static_cast< int >(result));
+  result = (unsigned int)(arg1)->GetNbrAtomIdx(arg2);
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -41926,6 +41728,588 @@ fail:
 
 swig_class cOBFingerprint;
 
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Iter(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::PluginIter<OpenBabel::OBFingerprint > *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    OpenBabel::PluginIter<OpenBabel::OBFingerprint > &_result_ref = OpenBabel::OBFingerprint::Iter();
+    result = (OpenBabel::PluginIter<OpenBabel::OBFingerprint > *) &_result_ref;
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_FindDefaultType(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (OpenBabel::OBFingerprint *)OpenBabel::OBFingerprint::FindDefaultType();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_FindType(int argc, VALUE *argv, VALUE self) {
+  std::string *arg1 = 0 ;
+  OpenBabel::OBFingerprint *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    std::string *ptr = (std::string *)0;
+    res1 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OpenBabel::OBFingerprint::FindType" "', argument " "1"" of type '" "std::string const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OpenBabel::OBFingerprint::FindType" "', argument " "1"" of type '" "std::string const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  result = (OpenBabel::OBFingerprint *)OpenBabel::OBFingerprint::FindType((std::string const &)*arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return vresult;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return Qnil;
+}
+
+
+SWIGINTERN void
+free_OpenBabel_OBFingerprint(OpenBabel::OBFingerprint *arg1) {
+    delete arg1;
+}
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_SetBit(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetBit" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SetBit" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SetBit" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int > * >(argp2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SetBit" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  (arg1)->SetBit(*arg2,arg3);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Fold(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Fold" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Fold" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Fold" "', argument " "2"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int > * >(argp2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Fold" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  (arg1)->Fold(*arg2,arg3);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_GetFingerprint__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  OpenBabel::OBBase *arg2 = (OpenBabel::OBBase *) 0 ;
+  std::vector<unsigned int > *arg3 = 0 ;
+  int arg4 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFingerprint" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OpenBabel__OBBase, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetFingerprint" "', argument " "2"" of type '" "OpenBabel::OBBase *""'"); 
+  }
+  arg2 = reinterpret_cast< OpenBabel::OBBase * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<unsigned int > * >(argp3);
+  ecode4 = SWIG_AsVal_int(argv[2], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GetFingerprint" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  result = (bool)(arg1)->GetFingerprint(arg2,*arg3,arg4);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_GetFingerprint__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  OpenBabel::OBBase *arg2 = (OpenBabel::OBBase *) 0 ;
+  std::vector<unsigned int > *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFingerprint" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OpenBabel__OBBase, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetFingerprint" "', argument " "2"" of type '" "OpenBabel::OBBase *""'"); 
+  }
+  arg2 = reinterpret_cast< OpenBabel::OBBase * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_std__vectorTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetFingerprint" "', argument " "3"" of type '" "std::vector<unsigned int > &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<unsigned int > * >(argp3);
+  result = (bool)(arg1)->GetFingerprint(arg2,*arg3);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_OBFingerprint_GetFingerprint(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[5];
+  int ii;
+  
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 5) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__OBFingerprint, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_OpenBabel__OBBase, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_t, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_OBFingerprint_GetFingerprint__SWIG_1(nargs, args, self);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OpenBabel__OBFingerprint, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_OpenBabel__OBBase, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_t, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_OBFingerprint_GetFingerprint__SWIG_0(nargs, args, self);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'OBFingerprint_GetFingerprint'");
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Description(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Description" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  result = (arg1)->Description();
+  vresult = SWIG_From_std_string(static_cast< std::string >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Flags(int argc, VALUE *argv, VALUE self) {
+  OpenBabel::OBFingerprint *arg1 = (OpenBabel::OBFingerprint *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OpenBabel__OBFingerprint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Flags" "', argument " "1"" of type '" "OpenBabel::OBFingerprint *""'"); 
+  }
+  arg1 = reinterpret_cast< OpenBabel::OBFingerprint * >(argp1);
+  result = (unsigned int)(arg1)->Flags();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Tanimoto__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  std::vector<unsigned int > *arg1 = 0 ;
+  std::vector<unsigned int > *arg2 = 0 ;
+  double result;
+  std::vector<unsigned int > temp1 ;
+  std::vector<unsigned int > temp2 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[0]);
+      temp1 = std::vector<unsigned int >(size);
+      arg1 = &temp1;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[0])[i];
+        if (FIXNUM_P(o))
+        temp1[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  {
+    if (rb_obj_is_kind_of(argv[1],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[1]);
+      temp2 = std::vector<unsigned int >(size);
+      arg2 = &temp2;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[1])[i];
+        if (FIXNUM_P(o))
+        temp2[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  result = (double)OpenBabel::OBFingerprint::Tanimoto((std::vector<unsigned int > const &)*arg1,(std::vector<unsigned int > const &)*arg2);
+  vresult = SWIG_From_double(static_cast< double >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Tanimoto__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  std::vector<unsigned int > *arg1 = 0 ;
+  unsigned int *arg2 = (unsigned int *) 0 ;
+  double result;
+  std::vector<unsigned int > temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+      unsigned int size = RARRAY_LEN(argv[0]);
+      temp1 = std::vector<unsigned int >(size);
+      arg1 = &temp1;
+      for (unsigned int i=0; i<size; i++) {
+        VALUE o = RARRAY_PTR(argv[0])[i];
+        if (FIXNUM_P(o))
+        temp1[i] = (unsigned int)(FIX2INT(o));
+        else
+        rb_raise(rb_eTypeError,
+          "wrong argument type"
+          " (expected vector<""unsigned int" ">)");
+      }
+    } else {
+      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_std__vectorTunsigned_int_t, 1);
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_unsigned_int, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OpenBabel::OBFingerprint::Tanimoto" "', argument " "2"" of type '" "unsigned int const *""'"); 
+  }
+  arg2 = reinterpret_cast< unsigned int * >(argp2);
+  result = (double)OpenBabel::OBFingerprint::Tanimoto((std::vector<unsigned int > const &)*arg1,(unsigned int const *)arg2);
+  vresult = SWIG_From_double(static_cast< double >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_OBFingerprint_Tanimoto(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[2];
+  int ii;
+  
+  argc = nargs;
+  if (argc > 2) SWIG_fail;
+  for (ii = 0; (ii < argc); ii++) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      /* native sequence? */
+      if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+        unsigned int size = RARRAY_LEN(argv[0]);
+        if (size == 0) {
+          /* an empty sequence can be of any type */
+          _v = 1;
+        } else {
+          /* check the first element only */
+          VALUE o = RARRAY_PTR(argv[0])[0];
+          if (FIXNUM_P(o))
+          _v = 1;
+          else
+          _v = 0;
+        }
+      } else {
+        /* wrapped vector? */
+        std::vector<unsigned int >* v;
+        if (SWIG_ConvertPtr(argv[0],(void **) &v, 
+            SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+        _v = 1;
+        else
+        _v = 0;
+      }
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_unsigned_int, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_OBFingerprint_Tanimoto__SWIG_1(nargs, args, self);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      /* native sequence? */
+      if (rb_obj_is_kind_of(argv[0],rb_cArray)) {
+        unsigned int size = RARRAY_LEN(argv[0]);
+        if (size == 0) {
+          /* an empty sequence can be of any type */
+          _v = 1;
+        } else {
+          /* check the first element only */
+          VALUE o = RARRAY_PTR(argv[0])[0];
+          if (FIXNUM_P(o))
+          _v = 1;
+          else
+          _v = 0;
+        }
+      } else {
+        /* wrapped vector? */
+        std::vector<unsigned int >* v;
+        if (SWIG_ConvertPtr(argv[0],(void **) &v, 
+            SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+        _v = 1;
+        else
+        _v = 0;
+      }
+    }
+    if (_v) {
+      {
+        /* native sequence? */
+        if (rb_obj_is_kind_of(argv[1],rb_cArray)) {
+          unsigned int size = RARRAY_LEN(argv[1]);
+          if (size == 0) {
+            /* an empty sequence can be of any type */
+            _v = 1;
+          } else {
+            /* check the first element only */
+            VALUE o = RARRAY_PTR(argv[1])[0];
+            if (FIXNUM_P(o))
+            _v = 1;
+            else
+            _v = 0;
+          }
+        } else {
+          /* wrapped vector? */
+          std::vector<unsigned int >* v;
+          if (SWIG_ConvertPtr(argv[1],(void **) &v, 
+              SWIGTYPE_p_std__vectorTunsigned_int_t,0) != -1)
+          _v = 1;
+          else
+          _v = 0;
+        }
+      }
+      if (_v) {
+        return _wrap_OBFingerprint_Tanimoto__SWIG_0(nargs, args, self);
+      }
+    }
+  }
+  
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'OBFingerprint_Tanimoto'");
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_OBFingerprint_Getbitsperint(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (unsigned int)OpenBabel::OBFingerprint::Getbitsperint();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_OBFingerprint_FindFingerprint(int argc, VALUE *argv, VALUE self) {
   std::string *arg1 = 0 ;
@@ -41957,43 +42341,6 @@ fail:
 }
 
 
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-SWIGINTERN VALUE
-_wrap_OBFingerprint_allocate(VALUE self) {
-#else
-  SWIGINTERN VALUE
-  _wrap_OBFingerprint_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-    
-    
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_OpenBabel__OBFingerprint);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
-#endif
-    return vresult;
-  }
-  
-
-SWIGINTERN VALUE
-_wrap_new_OBFingerprint(int argc, VALUE *argv, VALUE self) {
-  OpenBabel::OBFingerprint *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  result = (OpenBabel::OBFingerprint *)new OpenBabel::OBFingerprint();DATA_PTR(self) = result;
-  
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_OpenBabel_OBFingerprint(OpenBabel::OBFingerprint *arg1) {
-    delete arg1;
-}
-
 swig_class cFptIndexHeader;
 
 SWIGINTERN VALUE
@@ -59072,7 +59419,7 @@ SWIGINTERN VALUE
 _wrap_OBMolBondIter_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
   OpenBabel::OBMolBondIter *arg1 = (OpenBabel::OBMolBondIter *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -59092,8 +59439,8 @@ _wrap_OBMolBondIter_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
   }
   arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-  result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-  vresult = SWIG_From_int(static_cast< int >(result));
+  result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -66354,7 +66701,7 @@ SWIGINTERN VALUE
 _wrap_OBAtomBondIter_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
   OpenBabel::OBAtomBondIter *arg1 = (OpenBabel::OBAtomBondIter *) 0 ;
   OpenBabel::OBAtom *arg2 = (OpenBabel::OBAtom *) 0 ;
-  int result;
+  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -66374,8 +66721,8 @@ _wrap_OBAtomBondIter_GetNbrAtomIdx(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetNbrAtomIdx" "', argument " "2"" of type '" "OpenBabel::OBAtom *""'"); 
   }
   arg2 = reinterpret_cast< OpenBabel::OBAtom * >(argp2);
-  result = (int)(*arg1)->GetNbrAtomIdx(arg2);
-  vresult = SWIG_From_int(static_cast< int >(result));
+  result = (unsigned int)(*arg1)->GetNbrAtomIdx(arg2);
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -75918,6 +76265,7 @@ static swig_type_info _swigt__p_OpenBabel__OBTypeTable = {"_p_OpenBabel__OBTypeT
 static swig_type_info _swigt__p_OpenBabel__OBUnitCell = {"_p_OpenBabel__OBUnitCell", "OpenBabel::OBUnitCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OpenBabel__OBVirtualBond = {"_p_OpenBabel__OBVirtualBond", "OpenBabel::OBVirtualBond *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OpenBabel__Pattern = {"_p_OpenBabel__Pattern", "OpenBabel::Pattern *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t = {"_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t", "OpenBabel::PluginIter<OpenBabel::OBFingerprint > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OpenBabel__Template = {"_p_OpenBabel__Template", "OpenBabel::Template *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OpenBabel__matrix3x3 = {"_p_OpenBabel__matrix3x3", "OpenBabel::matrix3x3 *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OpenBabel__obLogBuf = {"_p_OpenBabel__obLogBuf", "OpenBabel::obLogBuf *", 0, 0, (void*)0, 0};
@@ -76062,6 +76410,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_OpenBabel__OBUnitCell,
   &_swigt__p_OpenBabel__OBVirtualBond,
   &_swigt__p_OpenBabel__Pattern,
+  &_swigt__p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t,
   &_swigt__p_OpenBabel__Template,
   &_swigt__p_OpenBabel__matrix3x3,
   &_swigt__p_OpenBabel__obLogBuf,
@@ -76206,6 +76555,7 @@ static swig_cast_info _swigc__p_OpenBabel__OBTypeTable[] = {  {&_swigt__p_OpenBa
 static swig_cast_info _swigc__p_OpenBabel__OBUnitCell[] = {  {&_swigt__p_OpenBabel__OBUnitCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OpenBabel__OBVirtualBond[] = {  {&_swigt__p_OpenBabel__OBVirtualBond, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OpenBabel__Pattern[] = {  {&_swigt__p_OpenBabel__Pattern, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t[] = {  {&_swigt__p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OpenBabel__Template[] = {  {&_swigt__p_OpenBabel__Template, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OpenBabel__matrix3x3[] = {  {&_swigt__p_OpenBabel__matrix3x3, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OpenBabel__obLogBuf[] = {  {&_swigt__p_OpenBabel__obLogBuf, 0, 0, 0},{0, 0, 0, 0}};
@@ -76350,6 +76700,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_OpenBabel__OBUnitCell,
   _swigc__p_OpenBabel__OBVirtualBond,
   _swigc__p_OpenBabel__Pattern,
+  _swigc__p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t,
   _swigc__p_OpenBabel__Template,
   _swigc__p_OpenBabel__matrix3x3,
   _swigc__p_OpenBabel__obLogBuf,
@@ -77030,51 +77381,52 @@ SWIGEXPORT void Init_openbabel(void) {
   rb_define_module_function(mOpenbabel, "vectorAngle", VALUEFUNC(_wrap_vectorAngle), -1);
   rb_define_module_function(mOpenbabel, "CalcTorsionAngle", VALUEFUNC(_wrap_CalcTorsionAngle), -1);
   rb_define_module_function(mOpenbabel, "Point2Plane", VALUEFUNC(_wrap_Point2Plane), -1);
+  rb_define_module_function(mOpenbabel, "Point2PlaneAngle", VALUEFUNC(_wrap_Point2PlaneAngle), -1);
   rb_define_singleton_method(mOpenbabel, "VZero", VALUEFUNC(VZero_get), 0);
   rb_define_singleton_method(mOpenbabel, "VX", VALUEFUNC(VX_get), 0);
   rb_define_singleton_method(mOpenbabel, "VY", VALUEFUNC(VY_get), 0);
   rb_define_singleton_method(mOpenbabel, "VZ", VALUEFUNC(VZ_get), 0);
   rb_define_module_function(mOpenbabel, "Trim", VALUEFUNC(_wrap_Trim), -1);
-  rb_define_singleton_method(mOpenbabel, "UndefinedData", VALUEFUNC(UndefinedData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PairData", VALUEFUNC(PairData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "EnergyData", VALUEFUNC(EnergyData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CommentData", VALUEFUNC(CommentData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ConformerData", VALUEFUNC(ConformerData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ExternalBondData", VALUEFUNC(ExternalBondData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "RotamerList", VALUEFUNC(RotamerList_get), 0);
-  rb_define_singleton_method(mOpenbabel, "VirtualBondData", VALUEFUNC(VirtualBondData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "RingData", VALUEFUNC(RingData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "TorsionData", VALUEFUNC(TorsionData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "AngleData", VALUEFUNC(AngleData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SerialNums", VALUEFUNC(SerialNums_get), 0);
-  rb_define_singleton_method(mOpenbabel, "UnitCell", VALUEFUNC(UnitCell_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SpinData", VALUEFUNC(SpinData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ChargeData", VALUEFUNC(ChargeData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SymmetryData", VALUEFUNC(SymmetryData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ChiralData", VALUEFUNC(ChiralData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "OccupationData", VALUEFUNC(OccupationData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "DensityData", VALUEFUNC(DensityData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ElectronicData", VALUEFUNC(ElectronicData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "VibrationData", VALUEFUNC(VibrationData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "RotationData", VALUEFUNC(RotationData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NuclearData", VALUEFUNC(NuclearData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SetData", VALUEFUNC(SetData_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData0", VALUEFUNC(CustomData0_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData1", VALUEFUNC(CustomData1_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData2", VALUEFUNC(CustomData2_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData3", VALUEFUNC(CustomData3_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData4", VALUEFUNC(CustomData4_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData5", VALUEFUNC(CustomData5_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData6", VALUEFUNC(CustomData6_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData7", VALUEFUNC(CustomData7_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData8", VALUEFUNC(CustomData8_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData9", VALUEFUNC(CustomData9_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData10", VALUEFUNC(CustomData10_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData11", VALUEFUNC(CustomData11_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData12", VALUEFUNC(CustomData12_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData13", VALUEFUNC(CustomData13_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData14", VALUEFUNC(CustomData14_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CustomData15", VALUEFUNC(CustomData15_get), 0);
+  rb_define_const(mOpenbabel, "UndefinedData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::UndefinedData)));
+  rb_define_const(mOpenbabel, "PairData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::PairData)));
+  rb_define_const(mOpenbabel, "EnergyData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::EnergyData)));
+  rb_define_const(mOpenbabel, "CommentData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CommentData)));
+  rb_define_const(mOpenbabel, "ConformerData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::ConformerData)));
+  rb_define_const(mOpenbabel, "ExternalBondData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::ExternalBondData)));
+  rb_define_const(mOpenbabel, "RotamerList", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::RotamerList)));
+  rb_define_const(mOpenbabel, "VirtualBondData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::VirtualBondData)));
+  rb_define_const(mOpenbabel, "RingData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::RingData)));
+  rb_define_const(mOpenbabel, "TorsionData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::TorsionData)));
+  rb_define_const(mOpenbabel, "AngleData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::AngleData)));
+  rb_define_const(mOpenbabel, "SerialNums", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::SerialNums)));
+  rb_define_const(mOpenbabel, "UnitCell", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::UnitCell)));
+  rb_define_const(mOpenbabel, "SpinData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::SpinData)));
+  rb_define_const(mOpenbabel, "ChargeData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::ChargeData)));
+  rb_define_const(mOpenbabel, "SymmetryData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::SymmetryData)));
+  rb_define_const(mOpenbabel, "ChiralData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::ChiralData)));
+  rb_define_const(mOpenbabel, "OccupationData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::OccupationData)));
+  rb_define_const(mOpenbabel, "DensityData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::DensityData)));
+  rb_define_const(mOpenbabel, "ElectronicData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::ElectronicData)));
+  rb_define_const(mOpenbabel, "VibrationData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::VibrationData)));
+  rb_define_const(mOpenbabel, "RotationData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::RotationData)));
+  rb_define_const(mOpenbabel, "NuclearData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::NuclearData)));
+  rb_define_const(mOpenbabel, "SetData", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::SetData)));
+  rb_define_const(mOpenbabel, "CustomData0", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData0)));
+  rb_define_const(mOpenbabel, "CustomData1", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData1)));
+  rb_define_const(mOpenbabel, "CustomData2", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData2)));
+  rb_define_const(mOpenbabel, "CustomData3", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData3)));
+  rb_define_const(mOpenbabel, "CustomData4", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData4)));
+  rb_define_const(mOpenbabel, "CustomData5", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData5)));
+  rb_define_const(mOpenbabel, "CustomData6", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData6)));
+  rb_define_const(mOpenbabel, "CustomData7", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData7)));
+  rb_define_const(mOpenbabel, "CustomData8", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData8)));
+  rb_define_const(mOpenbabel, "CustomData9", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData9)));
+  rb_define_const(mOpenbabel, "CustomData10", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData10)));
+  rb_define_const(mOpenbabel, "CustomData11", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData11)));
+  rb_define_const(mOpenbabel, "CustomData12", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData12)));
+  rb_define_const(mOpenbabel, "CustomData13", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData13)));
+  rb_define_const(mOpenbabel, "CustomData14", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData14)));
+  rb_define_const(mOpenbabel, "CustomData15", SWIG_From_int(static_cast< int >(OpenBabel::OBGenericDataType::CustomData15)));
   rb_define_const(mOpenbabel, "Any", SWIG_From_int(static_cast< int >(OpenBabel::any)));
   rb_define_const(mOpenbabel, "ReadInput", SWIG_From_int(static_cast< int >(OpenBabel::readInput)));
   rb_define_const(mOpenbabel, "UserInput", SWIG_From_int(static_cast< int >(OpenBabel::userInput)));
@@ -77362,6 +77714,32 @@ SWIGEXPORT void Init_openbabel(void) {
   cOBBase.mark = 0;
   cOBBase.destroy = (void (*)(void *)) free_OpenBabel_OBBase;
   cOBBase.trackObjects = 0;
+  
+  cPluginiterFingerprint.klass = rb_define_class_under(mOpenbabel, "PluginiterFingerprint", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_OpenBabel__PluginIterTOpenBabel__OBFingerprint_t, (void *) &cPluginiterFingerprint);
+  rb_define_alloc_func(cPluginiterFingerprint.klass, _wrap_pluginiterFingerprint_allocate);
+  rb_define_method(cPluginiterFingerprint.klass, "initialize", VALUEFUNC(_wrap_new_pluginiterFingerprint), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Register", VALUEFUNC(_wrap_pluginiterFingerprint_Register), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "FindType", VALUEFUNC(_wrap_pluginiterFingerprint_FindType), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "FindDefaultType", VALUEFUNC(_wrap_pluginiterFingerprint_FindDefaultType), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "ID", VALUEFUNC(_wrap_pluginiterFingerprint_ID), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Description", VALUEFUNC(_wrap_pluginiterFingerprint_Description), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "ToStart", VALUEFUNC(_wrap_pluginiterFingerprint_ToStart), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "inc", VALUEFUNC(_wrap_pluginiterFingerprint_inc), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "good", VALUEFUNC(_wrap_pluginiterFingerprint_good), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "deref", VALUEFUNC(_wrap_pluginiterFingerprint_deref), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "__ref__", VALUEFUNC(_wrap_pluginiterFingerprint___ref__), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Iter", VALUEFUNC(_wrap_pluginiterFingerprint_Iter), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "SetBit", VALUEFUNC(_wrap_pluginiterFingerprint_SetBit), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Fold", VALUEFUNC(_wrap_pluginiterFingerprint_Fold), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "GetFingerprint", VALUEFUNC(_wrap_pluginiterFingerprint_GetFingerprint), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Flags", VALUEFUNC(_wrap_pluginiterFingerprint_Flags), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Tanimoto", VALUEFUNC(_wrap_pluginiterFingerprint_Tanimoto), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "Getbitsperint", VALUEFUNC(_wrap_pluginiterFingerprint_Getbitsperint), -1);
+  rb_define_method(cPluginiterFingerprint.klass, "FindFingerprint", VALUEFUNC(_wrap_pluginiterFingerprint_FindFingerprint), -1);
+  cPluginiterFingerprint.mark = 0;
+  cPluginiterFingerprint.destroy = (void (*)(void *)) free_OpenBabel_PluginIter_Sl_OpenBabel_OBFingerprint_Sg_;
+  cPluginiterFingerprint.trackObjects = 0;
   rb_define_const(mOpenbabel, "ObError", SWIG_From_int(static_cast< int >(OpenBabel::obError)));
   rb_define_const(mOpenbabel, "ObWarning", SWIG_From_int(static_cast< int >(OpenBabel::obWarning)));
   rb_define_const(mOpenbabel, "ObInfo", SWIG_From_int(static_cast< int >(OpenBabel::obInfo)));
@@ -77580,97 +77958,97 @@ SWIGEXPORT void Init_openbabel(void) {
   rb_define_const(mOpenbabel, "AA_CYS", SWIG_From_int(static_cast< int >((1 << 18))));
   rb_define_const(mOpenbabel, "AA_MET", SWIG_From_int(static_cast< int >((1 << 19))));
   rb_define_const(mOpenbabel, "AA_TRP", SWIG_From_int(static_cast< int >((1 << 20))));
-  rb_define_singleton_method(mOpenbabel, "ACIDIC", VALUEFUNC(ACIDIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ACYCLIC", VALUEFUNC(ACYCLIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ALIPHATIC", VALUEFUNC(ALIPHATIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "AROMATIC", VALUEFUNC(AROMATIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "BASIC", VALUEFUNC(BASIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "BURIED", VALUEFUNC(BURIED_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CHARGED", VALUEFUNC(CHARGED_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CYCLIC", VALUEFUNC(CYCLIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "HYDROPHOBIC", VALUEFUNC(HYDROPHOBIC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "LARGE", VALUEFUNC(LARGE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "MEDIUM", VALUEFUNC(MEDIUM_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NEGATIVE", VALUEFUNC(NEGATIVE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NEUTRAL", VALUEFUNC(NEUTRAL_get), 0);
-  rb_define_singleton_method(mOpenbabel, "POLAR", VALUEFUNC(POLAR_get), 0);
-  rb_define_singleton_method(mOpenbabel, "POSITIVE", VALUEFUNC(POSITIVE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SMALL", VALUEFUNC(SMALL_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SURFACE", VALUEFUNC(SURFACE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ALPHA_CARBON", VALUEFUNC(ALPHA_CARBON_get), 0);
-  rb_define_singleton_method(mOpenbabel, "AMINO_BACKBONE", VALUEFUNC(AMINO_BACKBONE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "BACKBONE", VALUEFUNC(BACKBONE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CYSTEINE_SULPHUR", VALUEFUNC(CYSTEINE_SULPHUR_get), 0);
-  rb_define_singleton_method(mOpenbabel, "LIGAND", VALUEFUNC(LIGAND_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NUCLEIC_BACKBONE", VALUEFUNC(NUCLEIC_BACKBONE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SHAPELY_BACKBONE", VALUEFUNC(SHAPELY_BACKBONE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SHAPELY_SPECIAL", VALUEFUNC(SHAPELY_SPECIAL_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SIDECHAIN", VALUEFUNC(SIDECHAIN_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SUGAR_PHOSPHATE", VALUEFUNC(SUGAR_PHOSPHATE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ALA", VALUEFUNC(ALA_get), 0);
-  rb_define_singleton_method(mOpenbabel, "GLY", VALUEFUNC(GLY_get), 0);
-  rb_define_singleton_method(mOpenbabel, "LEU", VALUEFUNC(LEU_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SER", VALUEFUNC(SER_get), 0);
-  rb_define_singleton_method(mOpenbabel, "VAL", VALUEFUNC(VAL_get), 0);
-  rb_define_singleton_method(mOpenbabel, "THR", VALUEFUNC(THR_get), 0);
-  rb_define_singleton_method(mOpenbabel, "LYS", VALUEFUNC(LYS_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ASP", VALUEFUNC(ASP_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ILE", VALUEFUNC(ILE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ASN", VALUEFUNC(ASN_get), 0);
-  rb_define_singleton_method(mOpenbabel, "GLU", VALUEFUNC(GLU_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PRO", VALUEFUNC(PRO_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ARG", VALUEFUNC(ARG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PHE", VALUEFUNC(PHE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "GLN", VALUEFUNC(GLN_get), 0);
-  rb_define_singleton_method(mOpenbabel, "TYR", VALUEFUNC(TYR_get), 0);
-  rb_define_singleton_method(mOpenbabel, "HIS", VALUEFUNC(HIS_get), 0);
-  rb_define_singleton_method(mOpenbabel, "CYS", VALUEFUNC(CYS_get), 0);
-  rb_define_singleton_method(mOpenbabel, "MET", VALUEFUNC(MET_get), 0);
-  rb_define_singleton_method(mOpenbabel, "TRP", VALUEFUNC(TRP_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ASX", VALUEFUNC(ASX_get), 0);
-  rb_define_singleton_method(mOpenbabel, "GLX", VALUEFUNC(GLX_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PCA", VALUEFUNC(PCA_get), 0);
-  rb_define_singleton_method(mOpenbabel, "HYP", VALUEFUNC(HYP_get), 0);
-  rb_define_singleton_method(mOpenbabel, "A", VALUEFUNC(A_get), 0);
-  rb_define_singleton_method(mOpenbabel, "C", VALUEFUNC(C_get), 0);
-  rb_define_singleton_method(mOpenbabel, "G", VALUEFUNC(G_get), 0);
-  rb_define_singleton_method(mOpenbabel, "T", VALUEFUNC(T_get), 0);
-  rb_define_singleton_method(mOpenbabel, "U", VALUEFUNC(U_get), 0);
-  rb_define_singleton_method(mOpenbabel, "UPLUS", VALUEFUNC(UPLUS_get), 0);
-  rb_define_singleton_method(mOpenbabel, "I", VALUEFUNC(I_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_1MA", VALUEFUNC(_1MA_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_5MC", VALUEFUNC(_5MC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "OMC", VALUEFUNC(OMC_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_1MG", VALUEFUNC(_1MG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_2MG", VALUEFUNC(_2MG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "M2G", VALUEFUNC(M2G_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_7MG", VALUEFUNC(_7MG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "OMG", VALUEFUNC(OMG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "YG", VALUEFUNC(YG_get), 0);
-  rb_define_singleton_method(mOpenbabel, "H2U", VALUEFUNC(H2U_get), 0);
-  rb_define_singleton_method(mOpenbabel, "_5MU", VALUEFUNC(_5MU_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PSU", VALUEFUNC(PSU_get), 0);
-  rb_define_singleton_method(mOpenbabel, "UNK", VALUEFUNC(UNK_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ACE", VALUEFUNC(ACE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "FOR", VALUEFUNC(FOR_get), 0);
-  rb_define_singleton_method(mOpenbabel, "HOH", VALUEFUNC(HOH_get), 0);
-  rb_define_singleton_method(mOpenbabel, "DOD", VALUEFUNC(DOD_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SO4", VALUEFUNC(SO4_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PO4", VALUEFUNC(PO4_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NAD", VALUEFUNC(NAD_get), 0);
-  rb_define_singleton_method(mOpenbabel, "COA", VALUEFUNC(COA_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NAP", VALUEFUNC(NAP_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NDP", VALUEFUNC(NDP_get), 0);
-  rb_define_singleton_method(mOpenbabel, "AMINO", VALUEFUNC(AMINO_get), 0);
-  rb_define_singleton_method(mOpenbabel, "AMINO_NUCLEO", VALUEFUNC(AMINO_NUCLEO_get), 0);
-  rb_define_singleton_method(mOpenbabel, "COENZYME", VALUEFUNC(COENZYME_get), 0);
-  rb_define_singleton_method(mOpenbabel, "ION", VALUEFUNC(ION_get), 0);
-  rb_define_singleton_method(mOpenbabel, "NUCLEO", VALUEFUNC(NUCLEO_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PROTEIN", VALUEFUNC(PROTEIN_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PURINE", VALUEFUNC(PURINE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "PYRIMIDINE", VALUEFUNC(PYRIMIDINE_get), 0);
-  rb_define_singleton_method(mOpenbabel, "SOLVENT", VALUEFUNC(SOLVENT_get), 0);
-  rb_define_singleton_method(mOpenbabel, "WATER", VALUEFUNC(WATER_get), 0);
+  rb_define_const(mOpenbabel, "ACIDIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::ACIDIC)));
+  rb_define_const(mOpenbabel, "ACYCLIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::ACYCLIC)));
+  rb_define_const(mOpenbabel, "ALIPHATIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::ALIPHATIC)));
+  rb_define_const(mOpenbabel, "AROMATIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::AROMATIC)));
+  rb_define_const(mOpenbabel, "BASIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::BASIC)));
+  rb_define_const(mOpenbabel, "BURIED", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::BURIED)));
+  rb_define_const(mOpenbabel, "CHARGED", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::CHARGED)));
+  rb_define_const(mOpenbabel, "CYCLIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::CYCLIC)));
+  rb_define_const(mOpenbabel, "HYDROPHOBIC", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::HYDROPHOBIC)));
+  rb_define_const(mOpenbabel, "LARGE", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::LARGE)));
+  rb_define_const(mOpenbabel, "MEDIUM", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::MEDIUM)));
+  rb_define_const(mOpenbabel, "NEGATIVE", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::NEGATIVE)));
+  rb_define_const(mOpenbabel, "NEUTRAL", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::NEUTRAL)));
+  rb_define_const(mOpenbabel, "POLAR", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::POLAR)));
+  rb_define_const(mOpenbabel, "POSITIVE", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::POSITIVE)));
+  rb_define_const(mOpenbabel, "SMALL", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::SMALL)));
+  rb_define_const(mOpenbabel, "SURFACE", SWIG_From_int(static_cast< int >(OpenBabel::OBAminoAcidProperty::SURFACE)));
+  rb_define_const(mOpenbabel, "ALPHA_CARBON", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::ALPHA_CARBON)));
+  rb_define_const(mOpenbabel, "AMINO_BACKBONE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::AMINO_BACKBONE)));
+  rb_define_const(mOpenbabel, "BACKBONE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::BACKBONE)));
+  rb_define_const(mOpenbabel, "CYSTEINE_SULPHUR", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::CYSTEINE_SULPHUR)));
+  rb_define_const(mOpenbabel, "LIGAND", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::LIGAND)));
+  rb_define_const(mOpenbabel, "NUCLEIC_BACKBONE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::NUCLEIC_BACKBONE)));
+  rb_define_const(mOpenbabel, "SHAPELY_BACKBONE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::SHAPELY_BACKBONE)));
+  rb_define_const(mOpenbabel, "SHAPELY_SPECIAL", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::SHAPELY_SPECIAL)));
+  rb_define_const(mOpenbabel, "SIDECHAIN", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::SIDECHAIN)));
+  rb_define_const(mOpenbabel, "SUGAR_PHOSPHATE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueAtomProperty::SUGAR_PHOSPHATE)));
+  rb_define_const(mOpenbabel, "ALA", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ALA)));
+  rb_define_const(mOpenbabel, "GLY", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::GLY)));
+  rb_define_const(mOpenbabel, "LEU", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::LEU)));
+  rb_define_const(mOpenbabel, "SER", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::SER)));
+  rb_define_const(mOpenbabel, "VAL", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::VAL)));
+  rb_define_const(mOpenbabel, "THR", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::THR)));
+  rb_define_const(mOpenbabel, "LYS", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::LYS)));
+  rb_define_const(mOpenbabel, "ASP", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ASP)));
+  rb_define_const(mOpenbabel, "ILE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ILE)));
+  rb_define_const(mOpenbabel, "ASN", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ASN)));
+  rb_define_const(mOpenbabel, "GLU", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::GLU)));
+  rb_define_const(mOpenbabel, "PRO", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::PRO)));
+  rb_define_const(mOpenbabel, "ARG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ARG)));
+  rb_define_const(mOpenbabel, "PHE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::PHE)));
+  rb_define_const(mOpenbabel, "GLN", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::GLN)));
+  rb_define_const(mOpenbabel, "TYR", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::TYR)));
+  rb_define_const(mOpenbabel, "HIS", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::HIS)));
+  rb_define_const(mOpenbabel, "CYS", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::CYS)));
+  rb_define_const(mOpenbabel, "MET", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::MET)));
+  rb_define_const(mOpenbabel, "TRP", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::TRP)));
+  rb_define_const(mOpenbabel, "ASX", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ASX)));
+  rb_define_const(mOpenbabel, "GLX", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::GLX)));
+  rb_define_const(mOpenbabel, "PCA", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::PCA)));
+  rb_define_const(mOpenbabel, "HYP", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::HYP)));
+  rb_define_const(mOpenbabel, "A", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::A)));
+  rb_define_const(mOpenbabel, "C", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::C)));
+  rb_define_const(mOpenbabel, "G", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::G)));
+  rb_define_const(mOpenbabel, "T", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::T)));
+  rb_define_const(mOpenbabel, "U", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::U)));
+  rb_define_const(mOpenbabel, "UPLUS", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::UPLUS)));
+  rb_define_const(mOpenbabel, "I", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::I)));
+  rb_define_const(mOpenbabel, "_1MA", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_1MA)));
+  rb_define_const(mOpenbabel, "_5MC", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_5MC)));
+  rb_define_const(mOpenbabel, "OMC", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::OMC)));
+  rb_define_const(mOpenbabel, "_1MG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_1MG)));
+  rb_define_const(mOpenbabel, "_2MG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_2MG)));
+  rb_define_const(mOpenbabel, "M2G", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::M2G)));
+  rb_define_const(mOpenbabel, "_7MG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_7MG)));
+  rb_define_const(mOpenbabel, "OMG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::OMG)));
+  rb_define_const(mOpenbabel, "YG", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::YG)));
+  rb_define_const(mOpenbabel, "H2U", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::H2U)));
+  rb_define_const(mOpenbabel, "_5MU", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::_5MU)));
+  rb_define_const(mOpenbabel, "PSU", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::PSU)));
+  rb_define_const(mOpenbabel, "UNK", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::UNK)));
+  rb_define_const(mOpenbabel, "ACE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::ACE)));
+  rb_define_const(mOpenbabel, "FOR", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::FOR)));
+  rb_define_const(mOpenbabel, "HOH", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::HOH)));
+  rb_define_const(mOpenbabel, "DOD", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::DOD)));
+  rb_define_const(mOpenbabel, "SO4", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::SO4)));
+  rb_define_const(mOpenbabel, "PO4", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::PO4)));
+  rb_define_const(mOpenbabel, "NAD", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::NAD)));
+  rb_define_const(mOpenbabel, "COA", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::COA)));
+  rb_define_const(mOpenbabel, "NAP", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::NAP)));
+  rb_define_const(mOpenbabel, "NDP", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueIndex::NDP)));
+  rb_define_const(mOpenbabel, "AMINO", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::AMINO)));
+  rb_define_const(mOpenbabel, "AMINO_NUCLEO", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::AMINO_NUCLEO)));
+  rb_define_const(mOpenbabel, "COENZYME", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::COENZYME)));
+  rb_define_const(mOpenbabel, "ION", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::ION)));
+  rb_define_const(mOpenbabel, "NUCLEO", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::NUCLEO)));
+  rb_define_const(mOpenbabel, "PROTEIN", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::PROTEIN)));
+  rb_define_const(mOpenbabel, "PURINE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::PURINE)));
+  rb_define_const(mOpenbabel, "PYRIMIDINE", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::PYRIMIDINE)));
+  rb_define_const(mOpenbabel, "SOLVENT", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::SOLVENT)));
+  rb_define_const(mOpenbabel, "WATER", SWIG_From_int(static_cast< int >(OpenBabel::OBResidueProperty::WATER)));
   rb_define_singleton_method(mOpenbabel, "Residue", VALUEFUNC(Residue_get), 0);
   rb_define_singleton_method(mOpenbabel, "Residue=", VALUEFUNC(Residue_set), 1);
   rb_define_singleton_method(mOpenbabel, "ElemDesc", VALUEFUNC(ElemDesc_get), 0);
@@ -78214,8 +78592,18 @@ SWIGEXPORT void Init_openbabel(void) {
   
   cOBFingerprint.klass = rb_define_class_under(mOpenbabel, "OBFingerprint", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_OpenBabel__OBFingerprint, (void *) &cOBFingerprint);
-  rb_define_alloc_func(cOBFingerprint.klass, _wrap_OBFingerprint_allocate);
-  rb_define_method(cOBFingerprint.klass, "initialize", VALUEFUNC(_wrap_new_OBFingerprint), -1);
+  rb_undef_alloc_func(cOBFingerprint.klass);
+  rb_define_singleton_method(cOBFingerprint.klass, "Iter", VALUEFUNC(_wrap_OBFingerprint_Iter), -1);
+  rb_define_singleton_method(cOBFingerprint.klass, "FindDefaultType", VALUEFUNC(_wrap_OBFingerprint_FindDefaultType), -1);
+  rb_define_singleton_method(cOBFingerprint.klass, "FindType", VALUEFUNC(_wrap_OBFingerprint_FindType), -1);
+  rb_define_method(cOBFingerprint.klass, "SetBit", VALUEFUNC(_wrap_OBFingerprint_SetBit), -1);
+  rb_define_method(cOBFingerprint.klass, "Fold", VALUEFUNC(_wrap_OBFingerprint_Fold), -1);
+  rb_define_method(cOBFingerprint.klass, "GetFingerprint", VALUEFUNC(_wrap_OBFingerprint_GetFingerprint), -1);
+  rb_define_method(cOBFingerprint.klass, "Description", VALUEFUNC(_wrap_OBFingerprint_Description), -1);
+  rb_define_const(cOBFingerprint.klass, "FPT_UNIQUEBITS", SWIG_From_int(static_cast< int >(OpenBabel::OBFingerprint::FPT_UNIQUEBITS)));
+  rb_define_method(cOBFingerprint.klass, "Flags", VALUEFUNC(_wrap_OBFingerprint_Flags), -1);
+  rb_define_singleton_method(cOBFingerprint.klass, "Tanimoto", VALUEFUNC(_wrap_OBFingerprint_Tanimoto), -1);
+  rb_define_singleton_method(cOBFingerprint.klass, "Getbitsperint", VALUEFUNC(_wrap_OBFingerprint_Getbitsperint), -1);
   rb_define_singleton_method(cOBFingerprint.klass, "FindFingerprint", VALUEFUNC(_wrap_OBFingerprint_FindFingerprint), -1);
   cOBFingerprint.mark = 0;
   cOBFingerprint.destroy = (void (*)(void *)) free_OpenBabel_OBFingerprint;