diff --git a/src/osgWrappers/osg/Object.cpp b/src/osgWrappers/osg/Object.cpp
index 86e1b256d..312af8131 100644
--- a/src/osgWrappers/osg/Object.cpp
+++ b/src/osgWrappers/osg/Object.cpp
@@ -30,6 +30,7 @@ END_REFLECTOR
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object)
 	I_BaseType(osg::Referenced);
 	I_Constructor0();
+	I_Constructor1(IN, bool, threadSafeRefUnref);
 	I_ConstructorWithDefaults2(IN, const osg::Object &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
 	I_Method0(osg::Object *, cloneType);
 	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x);
diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp
index 0f2d40090..007aa8427 100644
--- a/src/osgWrappers/osg/Referenced.cpp
+++ b/src/osgWrappers/osg/Referenced.cpp
@@ -29,6 +29,7 @@ END_REFLECTOR
 
 BEGIN_OBJECT_REFLECTOR(osg::Referenced)
 	I_Constructor0();
+	I_Constructor1(IN, bool, threadSafeRefUnref);
 	I_Constructor1(IN, const osg::Referenced &, x);
 	I_Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe);
 	I_Method0(bool, getThreadSafeRefUnref);
diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp
index 2c1ab3547..0c6e81141 100644
--- a/src/osgWrappers/osg/StateSet.cpp
+++ b/src/osgWrappers/osg/StateSet.cpp
@@ -110,7 +110,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet)
 	I_Method1(void, removeUniform, IN, const std::string &, name);
 	I_Method1(void, removeUniform, IN, osg::Uniform *, uniform);
 	I_Method1(osg::Uniform *, getUniform, IN, const std::string &, name);
-	I_Method2(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, IN, osg::Uniform::Type, type);
+	I_MethodWithDefaults3(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, , IN, osg::Uniform::Type, type, , IN, unsigned int, numElements, 1);
 	I_Method1(const osg::Uniform *, getUniform, IN, const std::string &, name);
 	I_Method1(const osg::StateSet::RefUniformPair *, getUniformPair, IN, const std::string &, name);
 	I_Method1(void, setUniformList, IN, osg::StateSet::UniformList &, al);
diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp
index 023acaeee..5e32fce09 100644
--- a/src/osgWrappers/osg/Uniform.cpp
+++ b/src/osgWrappers/osg/Uniform.cpp
@@ -9,6 +9,7 @@
 #include <osgIntrospection/TypedMethodInfo>
 #include <osgIntrospection/Attributes>
 
+#include <osg/Array>
 #include <osg/CopyOp>
 #include <osg/GL2Extensions>
 #include <osg/Matrixd>
@@ -85,7 +86,7 @@ END_REFLECTOR
 BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	I_BaseType(osg::Object);
 	I_Constructor0();
-	I_Constructor2(IN, osg::Uniform::Type, type, IN, const std::string &, name);
+	I_ConstructorWithDefaults3(IN, osg::Uniform::Type, type, , IN, const std::string &, name, , IN, int, numElements, 1);
 	I_ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
 	I_Method0(osg::Object *, cloneType);
 	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
@@ -95,6 +96,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	I_Method1(bool, setType, IN, osg::Uniform::Type, t);
 	I_Method0(const osg::Uniform::Type, getType);
 	I_Method1(void, setName, IN, const std::string &, name);
+	I_Method1(void, setNumElements, IN, unsigned int, numElements);
+	I_Method0(unsigned int, getNumElements);
+	I_Method0(unsigned int, getInternalArrayNumElements);
 	I_Constructor2(IN, const char *, name, IN, float, f);
 	I_Constructor2(IN, const char *, name, IN, int, i);
 	I_Constructor2(IN, const char *, name, IN, bool, b);
@@ -151,6 +155,38 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	I_Method2(bool, get, IN, bool &, b0, IN, bool &, b1);
 	I_Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2);
 	I_Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, float, f);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, int, i);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, bool, b);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec2 &, v2);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec3 &, v3);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec4 &, v4);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix2 &, m2);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix3 &, m3);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixf &, m4);
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixd &, m4);
+	I_Method3(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1);
+	I_Method4(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2);
+	I_Method5(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3);
+	I_Method3(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1);
+	I_Method4(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2);
+	I_Method5(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, float &, f);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, int &, i);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, bool &, b);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec2 &, v2);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec3 &, v3);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec4 &, v4);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix2 &, m2);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix3 &, m3);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixf &, m4);
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixd &, m4);
+	I_Method3(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1);
+	I_Method4(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2);
+	I_Method5(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3);
+	I_Method3(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1);
+	I_Method4(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2);
+	I_Method5(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3);
 	I_Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc);
 	I_Method0(osg::Uniform::Callback *, getUpdateCallback);
 	I_Method0(const osg::Uniform::Callback *, getUpdateCallback);
@@ -158,13 +194,25 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	I_Method0(osg::Uniform::Callback *, getEventCallback);
 	I_Method0(const osg::Uniform::Callback *, getEventCallback);
 	I_Method0(void, dirty);
+	I_Method1(bool, setArray, IN, osg::FloatArray *, array);
+	I_Method1(bool, setArray, IN, osg::IntArray *, array);
+	I_Method0(osg::FloatArray *, getFloatArray);
+	I_Method0(const osg::FloatArray *, getFloatArray);
+	I_Method0(osg::IntArray *, getIntArray);
+	I_Method0(const osg::IntArray *, getIntArray);
 	I_Method1(void, setModifiedCount, IN, unsigned int, mc);
 	I_Method0(unsigned int, getModifiedCount);
 	I_Method2(void, apply, IN, const osg::GL2Extensions *, ext, IN, GLint, location);
 	I_WriteOnlyPropertyWithReturnType(bool, , bool);
+	I_WriteOnlyPropertyWithReturnType(osg::FloatArray *, Array, bool);
+	I_ArrayProperty_Custom(bool, Element, Elements, unsigned int, bool);
 	I_Property(osg::Uniform::Callback *, EventCallback);
+	I_ReadOnlyProperty(osg::FloatArray *, FloatArray);
+	I_ReadOnlyProperty(osg::IntArray *, IntArray);
+	I_ReadOnlyProperty(unsigned int, InternalArrayNumElements);
 	I_Property(unsigned int, ModifiedCount);
 	I_WriteOnlyProperty(const std::string &, Name);
+	I_WriteOnlyProperty(unsigned int, NumElements);
 	I_ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void);
 	I_ReadOnlyProperty(osg::Uniform::ParentList, Parents);
 	I_WriteOnlyPropertyWithReturnType(osg::Uniform::Type, Type, bool);
diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp
index c15beb3a0..ade201090 100644
--- a/src/osgWrappers/osgTerrain/DataSet.cpp
+++ b/src/osgWrappers/osgTerrain/DataSet.cpp
@@ -9,13 +9,14 @@
 #include <osgIntrospection/TypedMethodInfo>
 #include <osgIntrospection/Attributes>
 
-#include <osg/BoundingBox>
+#include <osg/BoundingSphere>
 #include <osg/CoordinateSystemNode>
 #include <osg/Image>
 #include <osg/Matrixd>
 #include <osg/Node>
 #include <osg/State>
 #include <osg/StateSet>
+#include <osg/Vec3>
 #include <osg/Vec4>
 #include <osgDB/Archive>
 #include <osgTerrain/DataSet>
@@ -101,7 +102,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet)
 	I_Method0(osg::EllipsoidModel *, getEllipsoidModel);
 	I_Method0(const osg::EllipsoidModel *, getEllipsoidModel);
 	I_Method0(bool, mapLatLongsToXYZ);
-	I_Method1(void, setDestinationExtents, IN, const osg::BoundingBox &, extents);
+	I_Method1(void, setDestinationExtents, IN, const osgTerrain::GeospatialExtents &, extents);
 	I_Method1(void, setDestinationGeoTransform, IN, const osg::Matrixd &, geoTransform);
 	I_Method1(void, setArchiveName, IN, const std::string &, filename);
 	I_Method0(const std::string &, getArchiveName);
@@ -139,7 +140,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet)
 	I_Method0(const std::string &, getCommentString);
 	I_Method1(void, setWriteNodeBeforeSimplification, IN, bool, flag);
 	I_Method0(bool, getWriteNodeBeforeSimplification);
-	I_Method9(osgTerrain::DataSet::CompositeDestination *, createDestinationGraph, IN, osgTerrain::DataSet::CompositeDestination *, parent, IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents, IN, unsigned int, maxImageSize, IN, unsigned int, maxTerrainSize, IN, unsigned int, currentLevel, IN, unsigned int, currentX, IN, unsigned int, currentY, IN, unsigned int, maxNumLevels);
+	I_Method9(osgTerrain::DataSet::CompositeDestination *, createDestinationGraph, IN, osgTerrain::DataSet::CompositeDestination *, parent, IN, osg::CoordinateSystemNode *, cs, IN, const osgTerrain::GeospatialExtents &, extents, IN, unsigned int, maxImageSize, IN, unsigned int, maxTerrainSize, IN, unsigned int, currentLevel, IN, unsigned int, currentX, IN, unsigned int, currentY, IN, unsigned int, maxNumLevels);
 	I_Method1(void, computeDestinationGraphFromSources, IN, unsigned int, numLevels);
 	I_Method0(void, updateSourcesForDestinationGraphNeeds);
 	I_Method0(void, populateDestinationGraphFromSources);
@@ -160,7 +161,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet)
 	I_Property(bool, DecorateGeneratedSceneGraphWithMultiTextureControl);
 	I_Property(const osg::Vec4 &, DefaultColor);
 	I_Property(osg::CoordinateSystemNode *, DestinationCoordinateSystem);
-	I_WriteOnlyProperty(const osg::BoundingBox &, DestinationExtents);
+	I_WriteOnlyProperty(const osgTerrain::GeospatialExtents &, DestinationExtents);
 	I_WriteOnlyProperty(const osg::Matrixd &, DestinationGeoTransform);
 	I_Property(const std::string &, DestinationImageExtension);
 	I_WriteOnlyProperty(const std::string &, DestinationName);
@@ -194,7 +195,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeDestination)
 	I_BaseType(osg::Referenced);
 	I_BaseType(osgTerrain::DataSet::SpatialProperties);
 	I_Constructor0();
-	I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents);
+	I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osgTerrain::GeospatialExtents &, extents);
 	I_Method0(void, computeNeighboursFromQuadMap);
 	I_Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph);
 	I_Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph);
@@ -401,7 +402,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::SourceData)
 	I_BaseType(osg::Referenced);
 	I_BaseType(osgTerrain::DataSet::SpatialProperties);
 	I_ConstructorWithDefaults1(IN, osgTerrain::DataSet::Source *, source, 0);
-	I_Method1(osg::BoundingBox, getExtents, IN, const osg::CoordinateSystemNode *, cs);
+	I_Method1(osgTerrain::GeospatialExtents, getExtents, IN, const osg::CoordinateSystemNode *, cs);
 	I_Method1(const osgTerrain::DataSet::SpatialProperties &, computeSpatialProperties, IN, const osg::CoordinateSystemNode *, cs);
 	I_Method1(bool, intersects, IN, const osgTerrain::DataSet::SpatialProperties &, sp);
 	I_Method1(void, read, IN, osgTerrain::DataSet::DestinationData &, destination);
@@ -413,11 +414,33 @@ END_REFLECTOR
 BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::SpatialProperties)
 	I_Constructor0();
 	I_Constructor1(IN, const osgTerrain::DataSet::SpatialProperties &, sp);
-	I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents);
+	I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osgTerrain::GeospatialExtents &, extents);
 	I_Method1(osgTerrain::DataSet::SpatialProperties &, assignSpatialProperties, IN, const osgTerrain::DataSet::SpatialProperties &, sp);
 	I_Method0(void, computeExtents);
 END_REFLECTOR
 
+BEGIN_VALUE_REFLECTOR(osgTerrain::GeospatialExtents)
+	I_Constructor0();
+	I_Constructor4(IN, double, xmin, IN, double, ymin, IN, double, xmax, IN, double, ymax);
+	I_Method0(double &, xMin);
+	I_Method0(double, xMin);
+	I_Method0(double &, yMin);
+	I_Method0(double, yMin);
+	I_Method0(double &, xMax);
+	I_Method0(double, xMax);
+	I_Method0(double &, yMax);
+	I_Method0(double, yMax);
+	I_Method0(void, init);
+	I_Method0(bool, valid);
+	I_Method0(double, radius);
+	I_Method0(double, radius2);
+	I_Method1(osgTerrain::GeospatialExtents, intersect, IN, const osgTerrain::GeospatialExtents &, e);
+	I_Method1(bool, intersects, IN, const osgTerrain::GeospatialExtents &, bb);
+	I_Method1(void, expandBy, IN, const osg::BoundingSphere &, sh);
+	I_Method1(void, expandBy, IN, const osg::Vec3 &, v);
+	I_Method1(void, expandBy, IN, const osgTerrain::GeospatialExtents &, e);
+END_REFLECTOR
+
 BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >)
 	I_Constructor0();
 	I_Constructor1(IN, osg::Image *, t);