From: Jay Cho <chojoong@gmail.com>
Date: Tue, 9 Jan 2024 04:31:24 +0000 (+0900)
Subject: Remove Not Referenced APIs
X-Git-Tag: accepted/tizen/unified/20240307.075439~3^2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F304010%2F3;p=platform%2Fcore%2Fuifw%2Fdali-csharp-binder.git

Remove Not Referenced APIs

Change-Id: Iedcca16d3333594284001317d0db7e9a41658d3c
---

diff --git a/dali-csharp-binder/common/dali-wrap.cpp b/dali-csharp-binder/common/dali-wrap.cpp
index 2cdb932a..0f2dce5f 100644
--- a/dali-csharp-binder/common/dali-wrap.cpp
+++ b/dali-csharp-binder/common/dali-wrap.cpp
@@ -3092,722 +3092,672 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Degree(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_360_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_0() {
   void * jresult ;
   Dali::Radian *result = 0 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_360;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_315_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
+  {
+    try {
+      result = (Dali::Radian *)new Dali::Radian();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (Dali::Radian *)&Dali::ANGLE_315;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_270_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_1(float jarg1) {
   void * jresult ;
+  float arg1 ;
   Dali::Radian *result = 0 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_270;
+  arg1 = (float)jarg1;
+  {
+    try {
+      result = (Dali::Radian *)new Dali::Radian(arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_225_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_2(void * jarg1) {
   void * jresult ;
+  Dali::Degree arg1 ;
+  Dali::Degree *argp1 ;
   Dali::Radian *result = 0 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_225;
+  argp1 = (Dali::Degree *)jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
+    return 0;
+  }
+  arg1 = *argp1;
+  {
+    try {
+      result = (Dali::Radian *)new Dali::Radian(arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_180_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_ConvertToFloat(void * jarg1) {
+  float jresult ;
+  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
+  float result;
 
-  result = (Dali::Radian *)&Dali::ANGLE_180;
-  jresult = (void *)result;
+  arg1 = (Dali::Radian *)jarg1;
+  {
+    try {
+      result = (float)((Dali::Radian const *)arg1)->operator float();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_135_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Radian_radian_set(void * jarg1, float jarg2) {
+  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
+  float arg2 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_135;
-  jresult = (void *)result;
-  return jresult;
+  arg1 = (Dali::Radian *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->radian = arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_120_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_radian_get(void * jarg1) {
+  float jresult ;
+  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
+  float result;
 
-  result = (Dali::Radian *)&Dali::ANGLE_120;
-  jresult = (void *)result;
+  arg1 = (Dali::Radian *)jarg1;
+  result = (float) ((arg1)->radian);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_90_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Radian(void * jarg1) {
+  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
+
+  arg1 = (Dali::Radian *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (Dali::Radian *)&Dali::ANGLE_90;
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_60_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_0() {
   void * jresult ;
-  Dali::Radian *result = 0 ;
+  Dali::Matrix *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Matrix *)new Dali::Matrix();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (Dali::Radian *)&Dali::ANGLE_60;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_45_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_1(bool jarg1) {
   void * jresult ;
-  Dali::Radian *result = 0 ;
+  bool arg1 ;
+  Dali::Matrix *result = 0 ;
+
+  arg1 = jarg1 ? true : false;
+  {
+    try {
+      result = (Dali::Matrix *)new Dali::Matrix(arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (Dali::Radian *)&Dali::ANGLE_45;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_30_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_2(float* jarg1) {
   void * jresult ;
-  Dali::Radian *result = 0 ;
+  float *arg1 = (float *) 0 ;
+  Dali::Matrix *result = 0 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_30;
-  jresult = (void *)result;
-  return jresult;
-}
+  arg1 = jarg1;
+  {
+    try {
+      result = (Dali::Matrix *)new Dali::Matrix((float const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
+  jresult = (void *)result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_0_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
 
-  result = (Dali::Radian *)&Dali::ANGLE_0;
-  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_5(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Degree *arg1 = 0 ;
-  Dali::Degree *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_3(void * jarg1) {
+  void * jresult ;
+  Dali::Quaternion *arg1 = 0 ;
+  Dali::Matrix *result = 0 ;
 
-  arg1 = (Dali::Degree *)jarg1;
+  arg1 = (Dali::Quaternion *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Degree const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Degree *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Degree const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)Dali::operator ==((Dali::Degree const &)*arg1,(Dali::Degree const &)*arg2);
+      result = (Dali::Matrix *)new Dali::Matrix((Dali::Quaternion const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_4(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Degree *arg1 = 0 ;
-  Dali::Degree *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_4(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = 0 ;
+  Dali::Matrix *result = 0 ;
 
-  arg1 = (Dali::Degree *)jarg1;
+  arg1 = (Dali::Matrix *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Degree const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Degree *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Degree const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)Dali::operator !=((Dali::Degree const &)*arg1,(Dali::Degree const &)*arg2);
+      result = (Dali::Matrix *)new Dali::Matrix((Dali::Matrix const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Degree arg1 ;
-  float arg2 ;
-  float arg3 ;
-  Dali::Degree *argp1 ;
-  Dali::Degree result;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  Dali::Matrix *result = 0 ;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
   {
     try {
-      result = Dali::Clamp(arg1,arg2,arg3);
+      result = (Dali::Matrix *) &(arg1)->operator =((Dali::Matrix const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Degree((const Dali::Degree &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_IDENTITY_get() {
   void * jresult ;
-  Dali::Radian *result = 0 ;
+  Dali::Matrix *result = 0 ;
+
+  result = (Dali::Matrix *)&Dali::Matrix::IDENTITY;
+  jresult = (void *)result;
+  return jresult;
+}
+
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentity(void * jarg1) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (Dali::Radian *)new Dali::Radian();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetIdentity();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_1(float jarg1) {
-  void * jresult ;
-  float arg1 ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentityAndScale(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (float)jarg1;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (Dali::Radian *)new Dali::Radian(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetIdentityAndScale((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_2(void * jarg1) {
-  void * jresult ;
-  Dali::Degree arg1 ;
-  Dali::Degree *argp1 ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_InvertTransform(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
+    return ;
   }
-  arg1 = *argp1;
   {
     try {
-      result = (Dali::Radian *)new Dali::Radian(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      ((Dali::Matrix const *)arg1)->InvertTransform(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Radian_Assign__SWIG_0(void * jarg1, float jarg2) {
-  void * jresult ;
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
-  float arg2 ;
-  Dali::Radian *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_Invert(void * jarg1) {
+  bool jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Radian *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (Dali::Radian *) &(arg1)->operator =(arg2);
+      result = (bool)(arg1)->Invert();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Radian_Assign__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
-  Dali::Degree arg2 ;
-  Dali::Degree *argp2 ;
-  Dali::Radian *result = 0 ;
-
-  arg1 = (Dali::Radian *)jarg1;
-  argp2 = (Dali::Degree *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Transpose(void * jarg1) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (Dali::Radian *) &(arg1)->operator =(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Transpose();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_ConvertToFloat(void * jarg1) {
-  float jresult ;
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetXAxis(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 result;
 
-  arg1 = (Dali::Radian *)jarg1;
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (float)((Dali::Radian const *)arg1)->operator float();
+      result = ((Dali::Matrix const *)arg1)->GetXAxis();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Radian_radian_set(void * jarg1, float jarg2) {
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
-  float arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetYAxis(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 result;
 
-  arg1 = (Dali::Radian *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->radian = arg2;
+  arg1 = (Dali::Matrix *)jarg1;
+  {
+    try {
+      result = ((Dali::Matrix const *)arg1)->GetYAxis();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_radian_get(void * jarg1) {
-  float jresult ;
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetZAxis(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 result;
 
-  arg1 = (Dali::Radian *)jarg1;
-  result = (float) ((arg1)->radian);
-  jresult = result;
+  arg1 = (Dali::Matrix *)jarg1;
+  {
+    try {
+      result = ((Dali::Matrix const *)arg1)->GetZAxis();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Radian(void * jarg1) {
-  Dali::Radian *arg1 = (Dali::Radian *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetXAxis(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (Dali::Radian *)jarg1;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->SetXAxis((Dali::Vector3 const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_6(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetYAxis(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator ==(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetYAxis((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_5(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetZAxis(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator !=(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetZAxis((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_7(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Degree arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Degree *argp2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector4 *result = 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Degree *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (bool)Dali::operator ==(arg1,arg2);
+      result = (Dali::Vector4 *) &((Dali::Matrix const *)arg1)->GetTranslation();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_6(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Degree arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Degree *argp2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation3(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *result = 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Degree *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (bool)Dali::operator !=(arg1,arg2);
+      result = (Dali::Vector3 *) &((Dali::Matrix const *)arg1)->GetTranslation3();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_8(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Degree arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Degree *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_0(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector4 *arg2 = 0 ;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector4 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator ==(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetTranslation((Dali::Vector4 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_7(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Degree arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Degree *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_1(void * jarg1, void * jarg2) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator !=(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetTranslation((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_0(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_OrthoNormalize(void * jarg1) {
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  {
+    try {
+      (arg1)->OrthoNormalize();
+    } CALL_CATCH_EXCEPTION();
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+
+}
+
+
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Matrix *arg1 = 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  Dali::Matrix *arg3 = 0 ;
+
+  arg1 = (Dali::Matrix *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
+    return ;
+  }
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Matrix *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator >(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      Dali::Matrix::Multiply(*arg1,(Dali::Matrix const &)*arg2,(Dali::Matrix const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_1(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Degree arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Degree *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Matrix *arg1 = 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  Dali::Quaternion *arg3 = 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
+  arg1 = (Dali::Matrix *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
+    return ;
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Degree *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Quaternion *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator >(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      Dali::Matrix::Multiply(*arg1,(Dali::Matrix const &)*arg2,(Dali::Quaternion const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_2(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Degree arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Degree *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_2(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Vector4 *arg2 = 0 ;
+  Dali::Vector4 result;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
+  arg1 = (Dali::Matrix *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  arg2 = (Dali::Vector4 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
     return 0;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator >(arg1,arg2);
+      result = ((Dali::Matrix const *)arg1)->operator *((Dali::Vector4 const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_0(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian *argp2 ;
-  bool result;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_4(void * nuiMatrixLhs, void * nuiMatrixRhs) {
+  // Faster mulitply operation without memcpy
+
+  Dali::Matrix *jresult = (Dali::Matrix *)0;
+  Dali::Matrix *lhsPtr  = (Dali::Matrix *)0;
+  Dali::Matrix *rhsPtr  = (Dali::Matrix *)0;
+
+  lhsPtr = (Dali::Matrix *)nuiMatrixLhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator <(arg1,arg2);
+      jresult = new Dali::Matrix(false);
+      Dali::Matrix::Multiply((Dali::Matrix &)*jresult,(Dali::Matrix const &)*rhsPtr,(Dali::Matrix const &)*lhsPtr);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_1(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Radian arg1 ;
-  Dali::Degree arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Degree *argp2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_MultiplyAssign(void * nuiMatrix, void * nuiMatrixRhs) {
+  void * jresult = 0;
+  Dali::Matrix *lhsPtr = (Dali::Matrix *) 0 ;
+  Dali::Matrix *rhsPtr = (Dali::Matrix *) 0 ;
+  Dali::Matrix *retPtr = (Dali::Matrix *) 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  lhsPtr = (Dali::Matrix *)nuiMatrix;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Degree *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
+  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator <(arg1,arg2);
+      retPtr = (Dali::Matrix *) &(lhsPtr)->operator *=((Dali::Matrix const &)*rhsPtr);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)retPtr;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_EqualTo(void * jarg1, void * jarg2) {
   bool jresult ;
-  Dali::Degree arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Degree *argp1 ;
-  Dali::Radian *argp2 ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
   bool result;
 
-  argp1 = (Dali::Degree *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Degree", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg2 = *argp2;
   {
     try {
-      result = (bool)Dali::operator <(arg1,arg2);
+      result = (bool)((Dali::Matrix const *)arg1)->operator ==((Dali::Matrix const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -3816,223 +3766,156 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_2(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Multiply(void * jarg1, float jarg2) {
-  void * jresult ;
-  Dali::Radian arg1 ;
-  float arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_NotEqualTo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  bool result;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
-  arg2 = (float)jarg2;
   {
     try {
-      result = Dali::operator *(arg1,arg2);
+      result = (bool)((Dali::Matrix const *)arg1)->operator !=((Dali::Matrix const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Radian((const Dali::Radian &)result);
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix_ValueOfIndex__SWIG_0(void * nuiMatrix, unsigned int index) {
+  float jresult ;
+  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Subtract(void * jarg1) {
-  void * jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian result;
-
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  pMatrix = (Dali::Matrix *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  if (index >= 16) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 16.)", 0);
     return 0;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::operator -(arg1);
+      const float* temp = ((Dali::Matrix const *)pMatrix)->AsFloat();
+      jresult = temp[index];
     } CALL_CATCH_EXCEPTION(0);
   }
-
-  jresult = new Dali::Radian((const Dali::Radian &)result);
   return jresult;
 }
 
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix_ValueOfIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn) {
+  float jresult ;
+  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_4(void * jarg1, float jarg2, float jarg3) {
-  void * jresult ;
-  Dali::Radian arg1 ;
-  float arg2 ;
-  float arg3 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian result;
-
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+  pMatrix = (Dali::Matrix *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  if (indexRow >= 4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 4.)", 0);
+    return 0;
+  }
+  if (indexColumn >= 4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 4.)", 0);
     return 0;
   }
-  arg1 = *argp1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
   {
     try {
-      result = Dali::Clamp(arg1,arg2,arg3);
+      const float* temp = ((Dali::Matrix const *)pMatrix)->AsFloat();
+      jresult = temp[(indexColumn << 2) | indexRow];
     } CALL_CATCH_EXCEPTION(0);
   }
-
-  jresult = new Dali::Radian((const Dali::Radian &)result);
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetValueAtIndex__SWIG_0(void * nuiMatrix, unsigned int index, float value) {
+  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_0() {
-  void * jresult ;
-  Dali::Matrix *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Matrix *)new Dali::Matrix();
-    } CALL_CATCH_EXCEPTION(0);
+  pMatrix = (Dali::Matrix *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return;
   }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_1(bool jarg1) {
-  void * jresult ;
-  bool arg1 ;
-  Dali::Matrix *result = 0 ;
-
-  arg1 = jarg1 ? true : false;
-  {
-    try {
-      result = (Dali::Matrix *)new Dali::Matrix(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+  if (index >= 16) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 16.)", 0);
+    return;
   }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_2(float* jarg1) {
-  void * jresult ;
-  float *arg1 = (float *) 0 ;
-  Dali::Matrix *result = 0 ;
-
-  arg1 = jarg1;
   {
     try {
-      result = (Dali::Matrix *)new Dali::Matrix((float const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      float* temp = ((Dali::Matrix *)pMatrix)->AsFloat();
+      temp[index] = value;
+    } CALL_CATCH_EXCEPTION();
   }
-
-  jresult = (void *)result;
-
-
-  return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetValueAtIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn, float value) {
+  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_3(void * jarg1) {
-  void * jresult ;
-  Dali::Quaternion *arg1 = 0 ;
-  Dali::Matrix *result = 0 ;
-
-  arg1 = (Dali::Quaternion *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
-    return 0;
+  pMatrix = (Dali::Matrix *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return;
   }
-  {
-    try {
-      result = (Dali::Matrix *)new Dali::Matrix((Dali::Quaternion const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+  if (indexRow >= 4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 4.)", 0);
+    return;
   }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_4(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix *arg1 = 0 ;
-  Dali::Matrix *result = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
+  if (indexColumn >= 4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 4.)", 0);
+    return;
   }
   {
     try {
-      result = (Dali::Matrix *)new Dali::Matrix((Dali::Matrix const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      float* temp = ((Dali::Matrix *)pMatrix)->AsFloat();
+      temp[(indexColumn << 2) | indexRow] = value;
+    } CALL_CATCH_EXCEPTION();
   }
-
-  jresult = (void *)result;
-  return jresult;
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  Dali::Matrix *result = 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  Dali::Quaternion *arg3 = 0 ;
+  Dali::Vector3 *arg4 = 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
+  arg2 = (Dali::Vector3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-  {
-    try {
-      result = (Dali::Matrix *) &(arg1)->operator =((Dali::Matrix const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+  arg3 = (Dali::Quaternion *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
+    return ;
+  }
+  arg4 = (Dali::Vector3 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_IDENTITY_get() {
-  void * jresult ;
-  Dali::Matrix *result = 0 ;
-
-  result = (Dali::Matrix *)&Dali::Matrix::IDENTITY;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentity(void * jarg1) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      (arg1)->SetIdentity();
+      (arg1)->SetTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Quaternion const &)*arg3,(Dali::Vector3 const &)*arg4);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentityAndScale(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
+  Dali::Quaternion *arg3 = 0 ;
+  Dali::Vector3 *arg4 = 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
   arg2 = (Dali::Vector3 *)jarg2;
@@ -4040,181 +3923,221 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentityAndScale(void * jarg1,
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return ;
   }
+  arg3 = (Dali::Quaternion *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
+    return ;
+  }
+  arg4 = (Dali::Vector3 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      (arg1)->SetIdentityAndScale((Dali::Vector3 const &)*arg2);
+      (arg1)->SetInverseTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Quaternion const &)*arg3,(Dali::Vector3 const &)*arg4);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_InvertTransform(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  Dali::Vector3 *arg3 = 0 ;
+  Dali::Vector3 *arg4 = 0 ;
+  Dali::Vector3 *arg5 = 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
+  arg2 = (Dali::Vector3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Vector3 *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
+  arg4 = (Dali::Vector3 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
+  arg5 = (Dali::Vector3 *)jarg5;
+  if (!arg5) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return ;
   }
   {
     try {
-      ((Dali::Matrix const *)arg1)->InvertTransform(*arg2);
+      (arg1)->SetInverseTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Vector3 const &)*arg3,(Dali::Vector3 const &)*arg4,(Dali::Vector3 const &)*arg5);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_Invert(void * jarg1) {
-  bool jresult ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_GetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  bool result;
+  Dali::Vector3 *arg2 = 0 ;
+  Dali::Quaternion *arg3 = 0 ;
+  Dali::Vector3 *arg4 = 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Quaternion *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion & type is null", 0);
+    return ;
+  }
+  arg4 = (Dali::Vector3 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (bool)(arg1)->Invert();
-    } CALL_CATCH_EXCEPTION(0);
+      ((Dali::Matrix const *)arg1)->GetTransformComponents(*arg2,*arg3,*arg4);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Transpose(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix(void * jarg1) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      (arg1)->Transpose();
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetXAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_IDENTITY_get() {
   void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 result;
-
-  arg1 = (Dali::Matrix *)jarg1;
-  {
-    try {
-      result = ((Dali::Matrix const *)arg1)->GetXAxis();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  Dali::Matrix3 *result = 0 ;
 
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  result = (Dali::Matrix3 *)&Dali::Matrix3::IDENTITY;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetYAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_0() {
   void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 result;
+  Dali::Matrix3 *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = ((Dali::Matrix const *)arg1)->GetYAxis();
+      result = (Dali::Matrix3 *)new Dali::Matrix3();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetZAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 result;
+  Dali::Matrix3 *arg1 = 0 ;
+  Dali::Matrix3 *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = ((Dali::Matrix const *)arg1)->GetZAxis();
+      result = (Dali::Matrix3 *)new Dali::Matrix3((Dali::Matrix3 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetXAxis(void * jarg1, void * jarg2) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_2(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = 0 ;
+  Dali::Matrix3 *result = 0 ;
 
   arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->SetXAxis((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Matrix3 *)new Dali::Matrix3((Dali::Matrix const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetYAxis(void * jarg1, void * jarg2) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_3(float jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7, float jarg8, float jarg9) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  float arg6 ;
+  float arg7 ;
+  float arg8 ;
+  float arg9 ;
+  Dali::Matrix3 *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg4;
+  arg5 = (float)jarg5;
+  arg6 = (float)jarg6;
+  arg7 = (float)jarg7;
+  arg8 = (float)jarg8;
+  arg9 = (float)jarg9;
   {
     try {
-      (arg1)->SetYAxis((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Matrix3 *)new Dali::Matrix3(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetZAxis(void * jarg1, void * jarg2) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_0(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix3 *arg2 = 0 ;
+  Dali::Matrix3 *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  arg2 = (Dali::Matrix3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetZAxis((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector4 *result = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
   {
     try {
-      result = (Dali::Vector4 *) &((Dali::Matrix const *)arg1)->GetTranslation();
+      result = (Dali::Matrix3 *) &(arg1)->operator =((Dali::Matrix3 const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4223,15 +4146,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *result = 0 ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  Dali::Matrix3 *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Vector3 *) &((Dali::Matrix const *)arg1)->GetTranslation3();
+      result = (Dali::Matrix3 *) &(arg1)->operator =((Dali::Matrix const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4240,256 +4169,231 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation3(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_0(void * jarg1, void * jarg2) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_EqualTo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix3 *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  arg2 = (Dali::Matrix3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return ;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->SetTranslation((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Matrix3 const *)arg1)->operator ==((Dali::Matrix3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_1(void * jarg1, void * jarg2) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_NotEqualTo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix3 *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  arg2 = (Dali::Matrix3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->SetTranslation((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Matrix3 const *)arg1)->operator !=((Dali::Matrix3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_OrthoNormalize(void * jarg1) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_ValueOfIndex__SWIG_0(void * nuiMatrix, unsigned int index) {
+  float jresult ;
+  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
+  pMatrix = (Dali::Matrix3 *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  if (index >= 9) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 9.)", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->OrthoNormalize();
-    } CALL_CATCH_EXCEPTION();
+      const float* temp = ((Dali::Matrix3 const *)pMatrix)->AsFloat();
+      jresult = temp[index];
+    } CALL_CATCH_EXCEPTION(0);
   }
-
+  return jresult;
 }
 
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_ValueOfIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn) {
+  float jresult ;
+  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_AsFloat__SWIG_0(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  float *result = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
+  pMatrix = (Dali::Matrix3 *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  if (indexRow >= 3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 3.)", 0);
+    return 0;
+  }
+  if (indexColumn >= 3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 3.)", 0);
+    return 0;
+  }
   {
     try {
-      result = (float *)((Dali::Matrix const *)arg1)->AsFloat();
+      const float* temp = ((Dali::Matrix3 const *)pMatrix)->AsFloat();
+      jresult = temp[indexColumn * 3 + indexRow];
     } CALL_CATCH_EXCEPTION(0);
   }
-
-  jresult = (void *)result;
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_0(void * nuiMatrix, unsigned int index, float value) {
+  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Matrix *arg1 = 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  Dali::Matrix *arg3 = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
-    return ;
-  }
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return ;
+  pMatrix = (Dali::Matrix3 *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return;
   }
-  arg3 = (Dali::Matrix *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return ;
+  if (index >= 9) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 9.)", 0);
+    return;
   }
   {
     try {
-      Dali::Matrix::Multiply(*arg1,(Dali::Matrix const &)*arg2,(Dali::Matrix const &)*arg3);
+      float* temp = ((Dali::Matrix3 *)pMatrix)->AsFloat();
+      temp[index] = value;
     } CALL_CATCH_EXCEPTION();
   }
-
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn, float value) {
+  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Matrix *arg1 = 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  Dali::Quaternion *arg3 = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
-    return ;
+  pMatrix = (Dali::Matrix3 *)nuiMatrix;
+  if (!pMatrix) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return;
   }
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return ;
+  if (indexRow >= 3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 3.)", 0);
+    return;
   }
-  arg3 = (Dali::Quaternion *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
-    return ;
+  if (indexColumn >= 3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 3.)", 0);
+    return;
   }
   {
     try {
-      Dali::Matrix::Multiply(*arg1,(Dali::Matrix const &)*arg2,(Dali::Quaternion const &)*arg3);
+      float* temp = ((Dali::Matrix3 *)pMatrix)->AsFloat();
+      temp[indexColumn * 3 + indexRow] = value;
     } CALL_CATCH_EXCEPTION();
   }
-
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_2(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-  Dali::Vector4 result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix3(void * jarg1) {
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      result = ((Dali::Matrix const *)arg1)->operator *((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_3(void * nuiMatrixLhs, void * nuiMatrixRhs) {
-  void * jresult ;
-  Dali::Matrix *lhsPtr = (Dali::Matrix *) 0 ;
-  Dali::Matrix *rhsPtr = (Dali::Matrix *) 0 ;
-  Dali::Matrix result(false);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetIdentity(void * jarg1) {
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
 
-  lhsPtr = (Dali::Matrix *)nuiMatrixLhs;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      result = ((Dali::Matrix const *)lhsPtr)->operator *((Dali::Matrix const &)*rhsPtr);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetIdentity();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Matrix((const Dali::Matrix &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_4(void * nuiMatrixLhs, void * nuiMatrixRhs) {
-  // Faster mulitply operation without memcpy
 
-  Dali::Matrix *jresult = (Dali::Matrix *)0;
-  Dali::Matrix *lhsPtr  = (Dali::Matrix *)0;
-  Dali::Matrix *rhsPtr  = (Dali::Matrix *)0;
 
-  lhsPtr = (Dali::Matrix *)nuiMatrixLhs;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_Invert(void * jarg1) {
+  bool jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  bool result;
+
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      jresult = new Dali::Matrix(false);
-      Dali::Matrix::Multiply((Dali::Matrix &)*jresult,(Dali::Matrix const &)*rhsPtr,(Dali::Matrix const &)*lhsPtr);
+      result = (bool)(arg1)->Invert();
     } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_MultiplyAssign(void * nuiMatrix, void * nuiMatrixRhs) {
-  void * jresult = 0;
-  Dali::Matrix *lhsPtr = (Dali::Matrix *) 0 ;
-  Dali::Matrix *rhsPtr = (Dali::Matrix *) 0 ;
-  Dali::Matrix *retPtr = (Dali::Matrix *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_Transpose(void * jarg1) {
+  bool jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  bool result;
 
-  lhsPtr = (Dali::Matrix *)nuiMatrix;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      retPtr = (Dali::Matrix *) &(lhsPtr)->operator *=((Dali::Matrix const &)*rhsPtr);
+      result = (bool)(arg1)->Transpose();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)retPtr;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_EqualTo(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Scale(void * jarg1, float jarg2) {
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  float arg2 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
+  arg1 = (Dali::Matrix3 *)jarg1;
+  arg2 = (float)jarg2;
+  {
+    try {
+      (arg1)->Scale(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
+
+}
+
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_Magnitude(void * jarg1) {
+  float jresult ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+  float result;
+
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      result = (bool)((Dali::Matrix const *)arg1)->operator ==((Dali::Matrix const &)*arg2);
+      result = (float)((Dali::Matrix3 const *)arg1)->Magnitude();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4498,21 +4402,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_EqualTo(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_ScaledInverseTranspose(void * jarg1) {
   bool jresult ;
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
+  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   bool result;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Matrix3 *)jarg1;
   {
     try {
-      result = (bool)((Dali::Matrix const *)arg1)->operator !=((Dali::Matrix const &)*arg2);
+      result = (bool)(arg1)->ScaledInverseTranspose();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4520,402 +4418,332 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_NotEqualTo(void * jarg1, void * j
   return jresult;
 }
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix_ValueOfIndex__SWIG_0(void * nuiMatrix, unsigned int index) {
-  float jresult ;
-  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-  pMatrix = (Dali::Matrix *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Multiply(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Matrix3 *arg1 = 0 ;
+  Dali::Matrix3 *arg2 = 0 ;
+  Dali::Matrix3 *arg3 = 0 ;
+
+  arg1 = (Dali::Matrix3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 & type is null", 0);
+    return ;
   }
-  if (index >= 16) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 16.)", 0);
-    return 0;
+  arg2 = (Dali::Matrix3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Matrix3 *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return ;
   }
   {
     try {
-      const float* temp = ((Dali::Matrix const *)pMatrix)->AsFloat();
-      jresult = temp[index];
-    } CALL_CATCH_EXCEPTION(0);
+      Dali::Matrix3::Multiply(*arg1,(Dali::Matrix3 const &)*arg2,(Dali::Matrix3 const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
-  return jresult;
+
 }
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix_ValueOfIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn) {
-  float jresult ;
-  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-  pMatrix = (Dali::Matrix *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
-  }
-  if (indexRow >= 4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 4.)", 0);
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_1(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Matrix3 *arg1 = 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  Dali::Vector3 result;
+
+  arg1 = (Dali::Matrix3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
     return 0;
   }
-  if (indexColumn >= 4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 4.)", 0);
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return 0;
   }
   {
     try {
-      const float* temp = ((Dali::Matrix const *)pMatrix)->AsFloat();
-      jresult = temp[(indexColumn << 2) | indexRow];
+      result = ((Dali::Matrix3 const *)arg1)->operator *((Dali::Vector3 const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetValueAtIndex__SWIG_0(void * nuiMatrix, unsigned int index, float value) {
-  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
 
-  pMatrix = (Dali::Matrix *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return;
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_3(void * nuiMatrix3Lhs, void * nuiMatrix3Rhs) {
+  // Faster mulitply operation without memcpy
+
+  Dali::Matrix3 *jresult = 0;
+  Dali::Matrix3 *lhsPtr  = 0;
+  Dali::Matrix3 *rhsPtr  = 0;
+
+  lhsPtr = (Dali::Matrix3 *)nuiMatrix3Lhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
-  if (index >= 16) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 16.)", 0);
-    return;
+  rhsPtr = (Dali::Matrix3 *)nuiMatrix3Rhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
   {
     try {
-      float* temp = ((Dali::Matrix *)pMatrix)->AsFloat();
-      temp[index] = value;
-    } CALL_CATCH_EXCEPTION();
+      jresult = new Dali::Matrix3();
+      Dali::Matrix3::Multiply((Dali::Matrix3 &)*jresult,(Dali::Matrix3 const &)*rhsPtr,(Dali::Matrix3 const &)*lhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
   }
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetValueAtIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn, float value) {
-  Dali::Matrix *pMatrix = (Dali::Matrix *) 0 ;
+  return jresult;
+}
 
-  pMatrix = (Dali::Matrix *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return;
-  }
-  if (indexRow >= 4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 4.)", 0);
-    return;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_MultiplyAssign(void * nuiMatrix, void * nuiMatrixRhs) {
+  void * jresult = 0;
+  Dali::Matrix3 *lhsPtr = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix3 *rhsPtr = (Dali::Matrix3 *) 0 ;
+  Dali::Matrix3 *retPtr = (Dali::Matrix3 *) 0 ;
+
+  lhsPtr = (Dali::Matrix3 *)nuiMatrix;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
-  if (indexColumn >= 4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 4.)", 0);
-    return;
+  rhsPtr = (Dali::Matrix3 *)nuiMatrixRhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
+    return 0;
   }
   {
     try {
-      float* temp = ((Dali::Matrix *)pMatrix)->AsFloat();
-      temp[(indexColumn << 2) | indexRow] = value;
-    } CALL_CATCH_EXCEPTION();
+      retPtr = (Dali::Matrix3 *) &(lhsPtr)->operator *=((Dali::Matrix3 const &)*rhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = (void *)retPtr;
+  return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Quaternion *arg3 = 0 ;
-  Dali::Vector3 *arg4 = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Quaternion *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
-    return ;
-  }
-  arg4 = (Dali::Vector3 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Quaternion const &)*arg3,(Dali::Vector3 const &)*arg4);
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Quaternion *arg3 = 0 ;
-  Dali::Vector3 *arg4 = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Quaternion *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
-    return ;
-  }
-  arg4 = (Dali::Vector3 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_0() {
+  void * jresult ;
+  Dali::AngleAxis *result = 0 ;
+
   {
     try {
-      (arg1)->SetInverseTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Quaternion const &)*arg3,(Dali::Vector3 const &)*arg4);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::AngleAxis *)new Dali::AngleAxis();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_1(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Radian arg1 ;
   Dali::Vector3 *arg2 = 0 ;
-  Dali::Vector3 *arg3 = 0 ;
-  Dali::Vector3 *arg4 = 0 ;
-  Dali::Vector3 *arg5 = 0 ;
+  Dali::Radian *argp1 ;
+  Dali::AngleAxis *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
+  argp1 = (Dali::Radian *)jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return 0;
+  }
+  arg1 = *argp1;
   arg2 = (Dali::Vector3 *)jarg2;
   if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Vector3 *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  arg4 = (Dali::Vector3 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  arg5 = (Dali::Vector3 *)jarg5;
-  if (!arg5) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
+    return 0;
   }
   {
     try {
-      (arg1)->SetInverseTransformComponents((Dali::Vector3 const &)*arg2,(Dali::Vector3 const &)*arg3,(Dali::Vector3 const &)*arg4,(Dali::Vector3 const &)*arg5);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::AngleAxis *)new Dali::AngleAxis(arg1,(Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_GetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Quaternion *arg3 = 0 ;
-  Dali::Vector3 *arg4 = 0 ;
-
-  arg1 = (Dali::Matrix *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Quaternion *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion & type is null", 0);
-    return ;
-  }
-  arg4 = (Dali::Vector3 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      ((Dali::Matrix const *)arg1)->GetTransformComponents(*arg2,*arg3,*arg4);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_angle_set(void * jarg1, void * jarg2) {
+  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
+  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
 
+  arg1 = (Dali::AngleAxis *)jarg1;
+  arg2 = (Dali::Radian *)jarg2;
+  if (arg1) (arg1)->angle = *arg2;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix(void * jarg1) {
-  Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_angle_get(void * jarg1) {
+  void * jresult ;
+  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
+  Dali::Radian *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+  arg1 = (Dali::AngleAxis *)jarg1;
+  result = (Dali::Radian *)& ((arg1)->angle);
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_axis_set(void * jarg1, void * jarg2) {
+  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
+  Dali::Vector3 *arg2 = (Dali::Vector3 *) 0 ;
 
+  arg1 = (Dali::AngleAxis *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (arg1) (arg1)->axis = *arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_IDENTITY_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_axis_get(void * jarg1) {
   void * jresult ;
-  Dali::Matrix3 *result = 0 ;
+  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
+  Dali::Vector3 *result = 0 ;
 
-  result = (Dali::Matrix3 *)&Dali::Matrix3::IDENTITY;
+  arg1 = (Dali::AngleAxis *)jarg1;
+  result = (Dali::Vector3 *)& ((arg1)->axis);
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_0() {
-  void * jresult ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleAxis(void * jarg1) {
+  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
 
+  arg1 = (Dali::AngleAxis *)jarg1;
   {
     try {
-      result = (Dali::Matrix3 *)new Dali::Matrix3();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix3 *arg1 = 0 ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_9(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::AngleAxis *arg1 = 0 ;
+  Dali::AngleAxis *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (Dali::AngleAxis *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::AngleAxis *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Matrix3 *)new Dali::Matrix3((Dali::Matrix3 const &)*arg1);
+      result = (bool)Dali::operator ==((Dali::AngleAxis const &)*arg1,(Dali::AngleAxis const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_2(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix *arg1 = 0 ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NextPowerOfTwo(unsigned int jarg1) {
+  unsigned int jresult ;
+  unsigned int arg1 ;
+  unsigned int result;
 
-  arg1 = (Dali::Matrix *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+  arg1 = (unsigned int)jarg1;
   {
     try {
-      result = (Dali::Matrix3 *)new Dali::Matrix3((Dali::Matrix const &)*arg1);
+      result = (unsigned int)Dali::NextPowerOfTwo(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_3(float jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7, float jarg8, float jarg9) {
-  void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  float arg3 ;
-  float arg4 ;
-  float arg5 ;
-  float arg6 ;
-  float arg7 ;
-  float arg8 ;
-  float arg9 ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsPowerOfTwo(unsigned int jarg1) {
+  bool jresult ;
+  unsigned int arg1 ;
+  bool result;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
-  arg5 = (float)jarg5;
-  arg6 = (float)jarg6;
-  arg7 = (float)jarg7;
-  arg8 = (float)jarg8;
-  arg9 = (float)jarg9;
+  arg1 = (unsigned int)jarg1;
   {
     try {
-      result = (Dali::Matrix3 *)new Dali::Matrix3(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+      result = (bool)Dali::IsPowerOfTwo(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_0(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix3 *arg2 = 0 ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_GetRangedEpsilon(float jarg1, float jarg2) {
+  float jresult ;
+  float arg1 ;
+  float arg2 ;
+  float result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  arg2 = (Dali::Matrix3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (Dali::Matrix3 *) &(arg1)->operator =((Dali::Matrix3 const &)*arg2);
+      result = (float)Dali::GetRangedEpsilon(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  Dali::Matrix3 *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualsZero(float jarg1) {
+  bool jresult ;
+  float arg1 ;
+  bool result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
   {
     try {
-      result = (Dali::Matrix3 *) &(arg1)->operator =((Dali::Matrix const &)*arg2);
+      result = (bool)Dali::EqualsZero(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Equals__SWIG_0(float jarg1, float jarg2) {
   bool jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix3 *arg2 = 0 ;
+  float arg1 ;
+  float arg2 ;
   bool result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  arg2 = (Dali::Matrix3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (bool)((Dali::Matrix3 const *)arg1)->operator ==((Dali::Matrix3 const &)*arg2);
+      result = (bool)Dali::Equals(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4924,21 +4752,19 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_EqualTo(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Equals__SWIG_1(float jarg1, float jarg2, float jarg3) {
   bool jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix3 *arg2 = 0 ;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
   bool result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  arg2 = (Dali::Matrix3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg3;
   {
     try {
-      result = (bool)((Dali::Matrix3 const *)arg1)->operator !=((Dali::Matrix3 const &)*arg2);
+      result = (bool)Dali::Equals(arg1,arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -4947,134 +4773,109 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_NotEqualTo(void * jarg1, void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_ValueOfIndex__SWIG_0(void * nuiMatrix, unsigned int index) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Round(float jarg1, int jarg2) {
   float jresult ;
-  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
+  float arg1 ;
+  int arg2 ;
+  float result;
 
-  pMatrix = (Dali::Matrix3 *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  if (index >= 9) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 9.)", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      const float* temp = ((Dali::Matrix3 const *)pMatrix)->AsFloat();
-      jresult = temp[index];
+      result = (float)Dali::Round(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = result;
   return jresult;
 }
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_ValueOfIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn) {
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_WrapInDomain(float jarg1, float jarg2, float jarg3) {
   float jresult ;
-  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float result;
 
-  pMatrix = (Dali::Matrix3 *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  if (indexRow >= 3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 3.)", 0);
-    return 0;
-  }
-  if (indexColumn >= 3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 3.)", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg3;
   {
     try {
-      const float* temp = ((Dali::Matrix3 const *)pMatrix)->AsFloat();
-      jresult = temp[indexColumn * 3 + indexRow];
+      result = (float)Dali::WrapInDomain(arg1,arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_0(void * nuiMatrix, unsigned int index, float value) {
-  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
-
-  pMatrix = (Dali::Matrix3 *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return;
-  }
-  if (index >= 9) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "index is out of range. (Check whether index >= 9.)", 0);
-    return;
-  }
-  {
-    try {
-      float* temp = ((Dali::Matrix3 *)pMatrix)->AsFloat();
-      temp[index] = value;
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_1(void * nuiMatrix, unsigned int indexRow, unsigned int indexColumn, float value) {
-  Dali::Matrix3 *pMatrix = (Dali::Matrix3 *) 0 ;
 
-  pMatrix = (Dali::Matrix3 *)nuiMatrix;
-  if (!pMatrix) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return;
-  }
-  if (indexRow >= 3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexRow is out of range. (Check whether indexRow >= 3.)", 0);
-    return;
-  }
-  if (indexColumn >= 3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, "indexColumn is out of range. (Check whether indexColumn >= 3.)", 0);
-    return;
-  }
-  {
-    try {
-      float* temp = ((Dali::Matrix3 *)pMatrix)->AsFloat();
-      temp[indexColumn * 3 + indexRow] = value;
-    } CALL_CATCH_EXCEPTION();
-  }
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix3(void * jarg1) {
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ShortestDistanceInDomain(float jarg1, float jarg2, float jarg3, float jarg4) {
+  float jresult ;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float result;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg4;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (float)Dali::ShortestDistanceInDomain(arg1,arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetIdentity(void * jarg1) {
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_0(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Handle *arg1 = 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property *result = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      (arg1)->SetIdentity();
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property *)new Dali::Property(*arg1,arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_1(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  float *result = 0 ;
+  Dali::Handle *arg1 = 0 ;
+  Dali::Property::Index arg2 ;
+  int arg3 ;
+  Dali::Property *result = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (float *)((Dali::Matrix3 const *)arg1)->AsFloat();
+      result = (Dali::Property *)new Dali::Property(*arg1,arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -5083,237 +4884,245 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_AsFloat__SWIG_0(void * jarg1)
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_Invert(void * jarg1) {
-  bool jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Matrix3 *)jarg1;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_2(void * jarg1, char * jarg2) {
+  void * jresult ;
+  Dali::Handle *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property *result = 0 ;
+
+  arg1 = (Dali::Handle *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
   {
     try {
-      result = (bool)(arg1)->Invert();
+      result = (Dali::Property *)new Dali::Property(*arg1,(std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_Transpose(void * jarg1) {
-  bool jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_3(void * jarg1, char * jarg2, int jarg3) {
+  void * jresult ;
+  Dali::Handle *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  int arg3 ;
+  Dali::Property *result = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (bool)(arg1)->Transpose();
+      result = (Dali::Property *)new Dali::Property(*arg1,(std::string const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Scale(void * jarg1, float jarg2) {
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  float arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property(void * jarg1) {
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::Property *)jarg1;
   {
     try {
-      (arg1)->Scale(arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_Magnitude(void * jarg1) {
-  float jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  float result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property__object_set(void * jarg1, void * jarg2) {
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  Dali::Handle *arg2 = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Matrix3 const *)arg1)->Magnitude();
-    } CALL_CATCH_EXCEPTION(0);
+  arg1 = (Dali::Property *)jarg1;
+  arg2 = (Dali::Handle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return ;
   }
+  if (arg1) (arg1)->object = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property__object_get(void * jarg1) {
+  void * jresult ;
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  Dali::Handle *result = 0 ;
+
+  arg1 = (Dali::Property *)jarg1;
+  result = (Dali::Handle *) &(Dali::Handle &) ((arg1)->object);
+  jresult = (void *)result;
+  return jresult;
+}
+
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_propertyIndex_set(void * jarg1, int jarg2) {
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  Dali::Property::Index arg2 ;
+
+  arg1 = (Dali::Property *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  if (arg1) (arg1)->propertyIndex = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_propertyIndex_get(void * jarg1) {
+  int jresult ;
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  Dali::Property::Index result;
+
+  arg1 = (Dali::Property *)jarg1;
+  result = (Dali::Property::Index) ((arg1)->propertyIndex);
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix3_ScaledInverseTranspose(void * jarg1) {
-  bool jresult ;
-  Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_componentIndex_set(void * jarg1, int jarg2) {
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  {
-    try {
-      result = (bool)(arg1)->ScaledInverseTranspose();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Property *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->componentIndex = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_componentIndex_get(void * jarg1) {
+  int jresult ;
+  Dali::Property *arg1 = (Dali::Property *) 0 ;
+  int result;
 
+  arg1 = (Dali::Property *)jarg1;
+  result = (int) ((arg1)->componentIndex);
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Multiply(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Matrix3 *arg1 = 0 ;
-  Dali::Matrix3 *arg2 = 0 ;
-  Dali::Matrix3 *arg3 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_0() {
+  void * jresult ;
+  Dali::Property::Array *result = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 & type is null", 0);
-    return ;
-  }
-  arg2 = (Dali::Matrix3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Matrix3 *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return ;
-  }
   {
     try {
-      Dali::Matrix3::Multiply(*arg1,(Dali::Matrix3 const &)*arg2,(Dali::Matrix3 const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Array *)new Dali::Property::Array();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::Matrix3 *arg1 = 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Vector3 result;
+  Dali::Property::Array *arg1 = 0 ;
+  Dali::Property::Array *result = 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
+  arg1 = (Dali::Property::Array *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = ((Dali::Matrix3 const *)arg1)->operator *((Dali::Vector3 const &)*arg2);
+      result = (Dali::Property::Array *)new Dali::Property::Array((Dali::Property::Array const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_2(void * nuiMatrix3Lhs, void * nuiMatrix3Rhs) {
-  void * jresult ;
-  Dali::Matrix3 *lhsPtr = 0 ;
-  Dali::Matrix3 *rhsPtr = 0 ;
-  Dali::Matrix3 result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Array(void * jarg1) {
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
 
-  lhsPtr = (Dali::Matrix3 *)nuiMatrix3Lhs;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix3 *)nuiMatrix3Rhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Array *)jarg1;
   {
     try {
-      result = ((Dali::Matrix3 const *)lhsPtr)->operator *((Dali::Matrix3 const &)*rhsPtr);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Matrix3((const Dali::Matrix3 &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_3(void * nuiMatrix3Lhs, void * nuiMatrix3Rhs) {
-  // Faster mulitply operation without memcpy
-
-  Dali::Matrix3 *jresult = 0;
-  Dali::Matrix3 *lhsPtr  = 0;
-  Dali::Matrix3 *rhsPtr  = 0;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Size(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType result;
 
-  lhsPtr = (Dali::Matrix3 *)nuiMatrix3Lhs;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix3 *)nuiMatrix3Rhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Array *)jarg1;
   {
     try {
-      jresult = new Dali::Matrix3();
-      Dali::Matrix3::Multiply((Dali::Matrix3 &)*jresult,(Dali::Matrix3 const &)*rhsPtr,(Dali::Matrix3 const &)*lhsPtr);
+      result = ((Dali::Property::Array const *)arg1)->Size();
     } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (unsigned long)result;
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_MultiplyAssign(void * nuiMatrix, void * nuiMatrixRhs) {
-  void * jresult = 0;
-  Dali::Matrix3 *lhsPtr = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix3 *rhsPtr = (Dali::Matrix3 *) 0 ;
-  Dali::Matrix3 *retPtr = (Dali::Matrix3 *) 0 ;
 
-  lhsPtr = (Dali::Matrix3 *)nuiMatrix;
-  if (!lhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
-  rhsPtr = (Dali::Matrix3 *)nuiMatrixRhs;
-  if (!rhsPtr) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Count(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType result;
+
+  arg1 = (Dali::Property::Array *)jarg1;
   {
     try {
-      retPtr = (Dali::Matrix3 *) &(lhsPtr)->operator *=((Dali::Matrix3 const &)*rhsPtr);
+      result = ((Dali::Property::Array const *)arg1)->Count();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)retPtr;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Range(float jarg1, float jarg2) {
-  float jresult ;
-  float arg1 ;
-  float arg2 ;
-  float result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Array_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  bool result;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::Property::Array *)jarg1;
   {
     try {
-      result = (float)Dali::Random::Range(arg1,arg2);
+      result = (bool)((Dali::Property::Array const *)arg1)->Empty();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -5322,381 +5131,340 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Range(float jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Axis() {
-  void * jresult ;
-  Dali::Vector4 result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Clear(void * jarg1) {
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
 
+  arg1 = (Dali::Property::Array *)jarg1;
   {
     try {
-      result = Dali::Random::Axis();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Clear();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_0() {
-  void * jresult ;
-  Dali::AngleAxis *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Reserve(void * jarg1, unsigned long jarg2) {
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType arg2 ;
 
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Array::SizeType)jarg2;
   {
     try {
-      result = (Dali::AngleAxis *)new Dali::AngleAxis();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Reserve(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Radian arg1 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Radian *argp1 ;
-  Dali::AngleAxis *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Resize(void * jarg1, unsigned long jarg2) {
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType arg2 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Array::SizeType)jarg2;
   {
     try {
-      result = (Dali::AngleAxis *)new Dali::AngleAxis(arg1,(Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Resize(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_angle_set(void * jarg1, void * jarg2) {
-  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
-  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
-
-  arg1 = (Dali::AngleAxis *)jarg1;
-  arg2 = (Dali::Radian *)jarg2;
-  if (arg1) (arg1)->angle = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_angle_get(void * jarg1) {
-  void * jresult ;
-  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
-  Dali::Radian *result = 0 ;
-
-  arg1 = (Dali::AngleAxis *)jarg1;
-  result = (Dali::Radian *)& ((arg1)->angle);
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_axis_set(void * jarg1, void * jarg2) {
-  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
-  Dali::Vector3 *arg2 = (Dali::Vector3 *) 0 ;
-
-  arg1 = (Dali::AngleAxis *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (arg1) (arg1)->axis = *arg2;
-}
-
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Capacity(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_axis_get(void * jarg1) {
-  void * jresult ;
-  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
-  Dali::Vector3 *result = 0 ;
+  arg1 = (Dali::Property::Array *)jarg1;
+  {
+    try {
+      result = (arg1)->Capacity();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (Dali::AngleAxis *)jarg1;
-  result = (Dali::Vector3 *)& ((arg1)->axis);
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleAxis(void * jarg1) {
-  Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_PushBack(void * jarg1, void * jarg2) {
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Value *arg2 = 0 ;
 
-  arg1 = (Dali::AngleAxis *)jarg1;
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Value *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->PushBack((Dali::Property::Value const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_9(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::AngleAxis *arg1 = 0 ;
-  Dali::AngleAxis *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_Add(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Value *arg2 = 0 ;
+  Dali::Property::Array *result = 0 ;
 
-  arg1 = (Dali::AngleAxis *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::AngleAxis *)jarg2;
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Value *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)Dali::operator ==((Dali::AngleAxis const &)*arg1,(Dali::AngleAxis const &)*arg2);
+      result = (Dali::Property::Array *) &(arg1)->Add((Dali::Property::Value const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NextPowerOfTwo(unsigned int jarg1) {
-  unsigned int jresult ;
-  unsigned int arg1 ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_GetElementAt__SWIG_0(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType arg2 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (unsigned int)jarg1;
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Array::SizeType)jarg2;
   {
     try {
-      result = (unsigned int)Dali::NextPowerOfTwo(arg1);
+      result = (Dali::Property::Value *) &((Dali::Property::Array const *)arg1)->GetElementAt(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsPowerOfTwo(unsigned int jarg1) {
-  bool jresult ;
-  unsigned int arg1 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+  Dali::Property::Array::SizeType arg2 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (unsigned int)jarg1;
+  arg1 = (Dali::Property::Array *)jarg1;
+  arg2 = (Dali::Property::Array::SizeType)jarg2;
   {
     try {
-      result = (bool)Dali::IsPowerOfTwo(arg1);
+      result = (Dali::Property::Value *) &((Dali::Property::Array const *)arg1)->operator [](arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_GetRangedEpsilon(float jarg1, float jarg2) {
-  float jresult ;
-  float arg1 ;
-  float arg2 ;
-  float result;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      result = (float)Dali::GetRangedEpsilon(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_type_set(void * jarg1, int jarg2) {
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  enum Dali::Property::Key::Type arg2 ;
 
+  arg1 = (Dali::Property::Key *)jarg1;
+  arg2 = (enum Dali::Property::Key::Type)jarg2;
+  if (arg1) (arg1)->type = arg2;
+}
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_EqualsZero(float jarg1) {
-  bool jresult ;
-  float arg1 ;
-  bool result;
 
-  arg1 = (float)jarg1;
-  {
-    try {
-      result = (bool)Dali::EqualsZero(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_type_get(void * jarg1) {
+  int jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  enum Dali::Property::Key::Type result;
 
-  jresult = result;
+  arg1 = (Dali::Property::Key *)jarg1;
+  result = (enum Dali::Property::Key::Type) ((arg1)->type);
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Equals__SWIG_0(float jarg1, float jarg2) {
-  bool jresult ;
-  float arg1 ;
-  float arg2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_set(void * jarg1, int jarg2) {
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  Dali::Property::Index arg2 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      result = (bool)Dali::Equals(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Property::Key *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  if (arg1) (arg1)->indexKey = arg2;
+}
 
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_get(void * jarg1) {
+  int jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  Dali::Property::Index result;
+
+  arg1 = (Dali::Property::Key *)jarg1;
+  result = (Dali::Property::Index) ((arg1)->indexKey);
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Equals__SWIG_1(float jarg1, float jarg2, float jarg3) {
-  bool jresult ;
-  float arg1 ;
-  float arg2 ;
-  float arg3 ;
-  bool result;
-
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
-  {
-    try {
-      result = (bool)Dali::Equals(arg1,arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_set(void * jarg1, char * jarg2) {
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  std::string *arg2 = 0 ;
+
+  arg1 = (Dali::Property::Key *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
   }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  if (arg1) (arg1)->stringKey = *arg2;
 
-  jresult = result;
+  //argout typemap for const std::string&
+
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_get(void * jarg1) {
+  char * jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  std::string *result = 0 ;
+
+  arg1 = (Dali::Property::Key *)jarg1;
+  result = (std::string *) & ((arg1)->stringKey);
+  jresult = SWIG_csharp_string_callback(result->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Round(float jarg1, int jarg2) {
-  float jresult ;
-  float arg1 ;
-  int arg2 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_0(char * jarg1) {
+  void * jresult ;
+  std::string *arg1 = 0 ;
+  Dali::Property::Key *result = 0 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (int)jarg2;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
   {
     try {
-      result = (float)Dali::Round(arg1,arg2);
+      result = (Dali::Property::Key *)new Dali::Property::Key((std::string const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_WrapInDomain(float jarg1, float jarg2, float jarg3) {
-  float jresult ;
-  float arg1 ;
-  float arg2 ;
-  float arg3 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_1(int jarg1) {
+  void * jresult ;
+  Dali::Property::Index arg1 ;
+  Dali::Property::Key *result = 0 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
+  arg1 = (Dali::Property::Index)jarg1;
   {
     try {
-      result = (float)Dali::WrapInDomain(arg1,arg2,arg3);
+      result = (Dali::Property::Key *)new Dali::Property::Key(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ShortestDistanceInDomain(float jarg1, float jarg2, float jarg3, float jarg4) {
-  float jresult ;
-  float arg1 ;
-  float arg2 ;
-  float arg3 ;
-  float arg4 ;
-  float result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_0(void * jarg1, char * jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  std::string *arg2 = 0 ;
+  bool result;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
+  arg1 = (Dali::Property::Key *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
   {
     try {
-      result = (float)Dali::ShortestDistanceInDomain(arg1,arg2,arg3,arg4);
+      result = (bool)(arg1)->operator ==((std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_0(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Handle *arg1 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_1(void * jarg1, int jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Index arg2 ;
-  Dali::Property *result = 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Key *)jarg1;
   arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      result = (Dali::Property *)new Dali::Property(*arg1,arg2);
+      result = (bool)(arg1)->operator ==(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  Dali::Handle *arg1 = 0 ;
-  Dali::Property::Index arg2 ;
-  int arg3 ;
-  Dali::Property *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_2(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  Dali::Property::Key *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+  arg1 = (Dali::Property::Key *)jarg1;
+  arg2 = (Dali::Property::Key *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Key const & type is null", 0);
     return 0;
   }
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (int)jarg3;
   {
     try {
-      result = (Dali::Property *)new Dali::Property(*arg1,arg2,arg3);
+      result = (bool)(arg1)->operator ==((Dali::Property::Key const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_2(void * jarg1, char * jarg2) {
-  void * jresult ;
-  Dali::Handle *arg1 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_0(void * jarg1, char * jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property *result = 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Key *)jarg1;
   if (!jarg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
@@ -5705,11 +5473,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_2(void * jarg1, cha
   arg2 = &arg2_str;
   {
     try {
-      result = (Dali::Property *)new Dali::Property(*arg1,(std::string const &)*arg2);
+      result = (bool)(arg1)->operator !=((std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
 
   //argout typemap for const std::string&
 
@@ -5717,43 +5485,52 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_2(void * jarg1, cha
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_3(void * jarg1, char * jarg2, int jarg3) {
-  void * jresult ;
-  Dali::Handle *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  int arg3 ;
-  Dali::Property *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_1(void * jarg1, int jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  Dali::Property::Index arg2 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return 0;
+  arg1 = (Dali::Property::Key *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  {
+    try {
+      result = (bool)(arg1)->operator !=(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_2(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+  Dali::Property::Key *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::Property::Key *)jarg1;
+  arg2 = (Dali::Property::Key *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Key const & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (int)jarg3;
   {
     try {
-      result = (Dali::Property *)new Dali::Property(*arg1,(std::string const &)*arg2,arg3);
+      result = (bool)(arg1)->operator !=((Dali::Property::Key const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property(void * jarg1) {
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Key(void * jarg1) {
+  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
 
-  arg1 = (Dali::Property *)jarg1;
+  arg1 = (Dali::Property::Key *)jarg1;
   {
     try {
       delete arg1;
@@ -5763,447 +5540,476 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property__object_set(void * jarg1, void * jarg2) {
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  Dali::Handle *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_0() {
+  void * jresult ;
+  Dali::Property::Map *result = 0 ;
 
-  arg1 = (Dali::Property *)jarg1;
-  arg2 = (Dali::Handle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return ;
+  {
+    try {
+      result = (Dali::Property::Map *)new Dali::Property::Map();
+    } CALL_CATCH_EXCEPTION(0);
   }
-  if (arg1) (arg1)->object = *arg2;
+
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property__object_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  Dali::Handle *result = 0 ;
+  Dali::Property::Map *arg1 = 0 ;
+  Dali::Property::Map *result = 0 ;
+
+  arg1 = (Dali::Property::Map *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::Property::Map *)new Dali::Property::Map((Dali::Property::Map const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (Dali::Property *)jarg1;
-  result = (Dali::Handle *) &(Dali::Handle &) ((arg1)->object);
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_propertyIndex_set(void * jarg1, int jarg2) {
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  Dali::Property::Index arg2 ;
-
-  arg1 = (Dali::Property *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  if (arg1) (arg1)->propertyIndex = arg2;
-}
-
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Map(void * jarg1) {
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_propertyIndex_get(void * jarg1) {
-  int jresult ;
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  Dali::Property::Index result;
+  arg1 = (Dali::Property::Map *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  arg1 = (Dali::Property *)jarg1;
-  result = (Dali::Property::Index) ((arg1)->propertyIndex);
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_componentIndex_set(void * jarg1, int jarg2) {
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  int arg2 ;
-
-  arg1 = (Dali::Property *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->componentIndex = arg2;
-}
-
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Map_Count(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Map::SizeType result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_componentIndex_get(void * jarg1) {
-  int jresult ;
-  Dali::Property *arg1 = (Dali::Property *) 0 ;
-  int result;
+  arg1 = (Dali::Property::Map *)jarg1;
+  {
+    try {
+      result = ((Dali::Property::Map const *)arg1)->Count();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (Dali::Property *)jarg1;
-  result = (int) ((arg1)->componentIndex);
-  jresult = result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_0() {
-  void * jresult ;
-  Dali::Property::Array *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  bool result;
 
+  arg1 = (Dali::Property::Map *)jarg1;
   {
     try {
-      result = (Dali::Property::Array *)new Dali::Property::Array();
+      result = (bool)((Dali::Property::Map const *)arg1)->Empty();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Property::Array *arg1 = 0 ;
-  Dali::Property::Array *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Dali::Property::Value *arg3 = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array const & type is null", 0);
-    return 0;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (char *)jarg2;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Property::Array *)new Dali::Property::Array((Dali::Property::Array const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Insert((char const *)arg2,(Dali::Property::Value const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Array(void * jarg1) {
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value *arg3 = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->Insert(arg2,(Dali::Property::Value const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Size(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Dali::Property::Value *arg3 = 0 ;
+  Dali::Property::Map *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (char *)jarg2;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = ((Dali::Property::Array const *)arg1)->Size();
+      result = (Dali::Property::Map *) &(arg1)->Add((char const *)arg2,(Dali::Property::Value const &)*arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Count(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value *arg3 = 0 ;
+  Dali::Property::Map *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = ((Dali::Property::Array const *)arg1)->Count();
+      result = (Dali::Property::Map *) &(arg1)->Add(arg2,(Dali::Property::Value const &)*arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Array_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetValue(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Map::SizeType arg2 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Map::SizeType)jarg2;
   {
     try {
-      result = (bool)((Dali::Property::Array const *)arg1)->Empty();
+      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->GetValue(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Clear(void * jarg1) {
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Map_GetKey(void * jarg1, unsigned long jarg2) {
+  char * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Map::SizeType arg2 ;
+  std::string *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Map::SizeType)jarg2;
   {
     try {
-      (arg1)->Clear();
-    } CALL_CATCH_EXCEPTION();
+      result = (std::string *) &((Dali::Property::Map const *)arg1)->GetKey(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = SWIG_csharp_string_callback(result->c_str());
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Reserve(void * jarg1, unsigned long jarg2) {
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetKeyAt(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Map::SizeType arg2 ;
+  SwigValueWrapper< Dali::Property::Key > result;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Array::SizeType)jarg2;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Map::SizeType)jarg2;
   {
     try {
-      (arg1)->Reserve(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::Property::Map const *)arg1)->GetKeyAt(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Property::Key((const Dali::Property::Key &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Resize(void * jarg1, unsigned long jarg2) {
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType arg2 ;
-
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Array::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Resize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Capacity(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_0(void * jarg1, char * jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (char *)jarg2;
   {
     try {
-      result = (arg1)->Capacity();
+      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find((char const *)arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_PushBack(void * jarg1, void * jarg2) {
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Value *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_2(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      (arg1)->PushBack((Dali::Property::Value const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_3(void * jarg1, int jarg2, char * jarg3) {
   void * jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Value *arg2 = 0 ;
-  Dali::Property::Array *result = 0 ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Index arg2 ;
+  std::string *arg3 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  if (!jarg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
+  std::string arg3_str(jarg3);
+  arg3 = &arg3_str;
   {
     try {
-      result = (Dali::Property::Array *) &(arg1)->Add((Dali::Property::Value const &)*arg2);
+      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find(arg2,(std::string const &)*arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_GetElementAt__SWIG_0(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType arg2 ;
-  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Array::SizeType)jarg2;
+
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Clear(void * jarg1) {
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+
+  arg1 = (Dali::Property::Map *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *) &((Dali::Property::Array const *)arg1)->GetElementAt(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Clear();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array::SizeType arg2 ;
-  Dali::Property::Value *result = 0 ;
-
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Array::SizeType)jarg2;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Remove__SWIG_0(void * map, int key) {
+  Dali::Property::Map *propertyMap = (Dali::Property::Map *)map;
+  Dali::Property::Index intKey = (Dali::Property::Index)key;
+  bool isRemoved = false;
   {
     try {
-      result = (Dali::Property::Value *) &((Dali::Property::Array const *)arg1)->operator [](arg2);
+      isRemoved = propertyMap->Remove(intKey);
     } CALL_CATCH_EXCEPTION(0);
   }
+  return isRemoved;
+}
 
-  jresult = (void *)result;
-  return jresult;
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Remove__SWIG_1(void * map, char * key) {
+  Dali::Property::Map *propertyMap = (Dali::Property::Map *)map;
+  std::string strKey(key);
+  bool isRemoved = false;
+  {
+    try {
+      isRemoved = propertyMap->Remove(strKey);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return isRemoved;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
-  Dali::Property::Array *arg2 = 0 ;
-  Dali::Property::Array *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Merge(void * jarg1, void * jarg2) {
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  Dali::Property::Map *arg2 = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  arg2 = (Dali::Property::Array *)jarg2;
+  arg1 = (Dali::Property::Map *)jarg1;
+  arg2 = (Dali::Property::Map *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array const & type is null", 0);
-    return 0;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Property::Array *) &(arg1)->operator =((Dali::Property::Array const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Merge((Dali::Property::Map const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_type_set(void * jarg1, int jarg2) {
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  enum Dali::Property::Key::Type arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_0(void * jarg1, char * jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  arg2 = (enum Dali::Property::Key::Type)jarg2;
-  if (arg1) (arg1)->type = arg2;
-}
+  arg1 = (Dali::Property::Map *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  {
+    try {
+      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->operator []((std::string const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
+  jresult = (void *)result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_type_get(void * jarg1) {
-  int jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  enum Dali::Property::Key::Type result;
+  //argout typemap for const std::string&
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  result = (enum Dali::Property::Key::Type) ((arg1)->type);
-  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_set(void * jarg1, int jarg2) {
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_2(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
   arg2 = (Dali::Property::Index)jarg2;
-  if (arg1) (arg1)->indexKey = arg2;
+  {
+    try {
+      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->operator [](arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_get(void * jarg1) {
-  int jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  Dali::Property::Index result;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  result = (Dali::Property::Index) ((arg1)->indexKey);
-  jresult = result;
-  return jresult;
-}
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_SetValue_StringKey(void* jarg1, char* jarg2, void* jarg3) {
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_set(void * jarg1, char * jarg2) {
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  std::string *arg2 = 0 ;
+  Dali::Property::Map* arg1 = (Dali::Property::Map*)jarg1;
 
-  arg1 = (Dali::Property::Key *)jarg1;
   if (!jarg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
+    return;
   }
   std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  if (arg1) (arg1)->stringKey = *arg2;
+  std::string* arg2 = &arg2_str;
 
-  //argout typemap for const std::string&
+  Dali::Property::Value* arg3 = (Dali::Property::Value*)jarg3;
 
+  {
+    try {
+      arg1->operator[]((std::string const &)*arg2) = *arg3;
+    } CALL_CATCH_EXCEPTION();
+  }
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_get(void * jarg1) {
-  char * jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  std::string *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_SetValue_IntKey(void* jarg1, int jarg2, void* jarg3) {
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  result = (std::string *) & ((arg1)->stringKey);
-  jresult = SWIG_csharp_string_callback(result->c_str());
-  return jresult;
+  Dali::Property::Map* arg1 = (Dali::Property::Map*)jarg1;
+  Dali::Property::Index arg2 = (Dali::Property::Index)jarg2;
+  Dali::Property::Value* arg3 = (Dali::Property::Value*)jarg3;
+
+  {
+    try {
+      arg1->operator[](arg2) = *arg3;
+    } CALL_CATCH_EXCEPTION();
+  }
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_0(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_0() {
   void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::Property::Key *result = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
   {
     try {
-      result = (Dali::Property::Key *)new Dali::Property::Key((std::string const &)*arg1);
+      result = (Dali::Property::Value *)new Dali::Property::Value();
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_1(bool jarg1) {
   void * jresult ;
-  Dali::Property::Index arg1 ;
-  Dali::Property::Key *result = 0 ;
+  bool arg1 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Index)jarg1;
+  arg1 = jarg1 ? true : false;
   {
     try {
-      result = (Dali::Property::Key *)new Dali::Property::Key(arg1);
+      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6212,164 +6018,158 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_0(void * jarg1, char * jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  std::string *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_2(int jarg1) {
+  void * jresult ;
+  int arg1 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
+  arg1 = (int)jarg1;
   {
     try {
-      result = (bool)(arg1)->operator ==((std::string const &)*arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
-
-  //argout typemap for const std::string&
-
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_1(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  Dali::Property::Index arg2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_3(float jarg1) {
+  void * jresult ;
+  float arg1 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (float)jarg1;
   {
     try {
-      result = (bool)(arg1)->operator ==(arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_2(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  Dali::Property::Key *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_4(void * jarg1) {
+  void * jresult ;
+  Dali::Vector2 *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  arg2 = (Dali::Property::Key *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Key const & type is null", 0);
+  arg1 = (Dali::Vector2 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)(arg1)->operator ==((Dali::Property::Key const &)*arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector2 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_0(void * jarg1, char * jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  std::string *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_5(void * jarg1) {
+  void * jresult ;
+  Dali::Vector3 *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::Vector3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
   {
     try {
-      result = (bool)(arg1)->operator !=((std::string const &)*arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector3 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
-
-  //argout typemap for const std::string&
-
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_1(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  Dali::Property::Index arg2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_6(void * jarg1) {
+  void * jresult ;
+  Dali::Vector4 *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (Dali::Vector4 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (bool)(arg1)->operator !=(arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector4 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_2(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
-  Dali::Property::Key *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_7(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix3 *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
-  arg2 = (Dali::Property::Key *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Key const & type is null", 0);
+  arg1 = (Dali::Matrix3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)(arg1)->operator !=((Dali::Property::Key const &)*arg2);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Matrix3 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Key(void * jarg1) {
-  Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_8(void * jarg1) {
+  void * jresult ;
+  Dali::Matrix *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Key *)jarg1;
+  arg1 = (Dali::Matrix *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Matrix const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_9(void * jarg1) {
   void * jresult ;
-  Dali::Property::Map *result = 0 ;
+  Dali::Rect< int > *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
+  arg1 = (Dali::Rect< int > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Property::Map *)new Dali::Property::Map();
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Rect< int > const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6378,19 +6178,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_10(void * jarg1) {
   void * jresult ;
-  Dali::Property::Map *arg1 = 0 ;
-  Dali::Property::Map *result = 0 ;
+  Dali::AngleAxis *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
+  arg1 = (Dali::AngleAxis *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Map *)new Dali::Property::Map((Dali::Property::Map const &)*arg1);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::AngleAxis const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6399,112 +6199,124 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Map(void * jarg1) {
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_11(void * jarg1) {
+  void * jresult ;
+  Dali::Quaternion *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
+  arg1 = (Dali::Quaternion *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Quaternion const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Map_Count(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map::SizeType result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_12(char * jarg1) {
+  void * jresult ;
+  std::string *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
   {
     try {
-      result = ((Dali::Property::Map const *)arg1)->Count();
+      result = (Dali::Property::Value *)new Dali::Property::Value((std::string const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_14(void * jarg1) {
+  void * jresult ;
+  Dali::Property::Array *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
+  arg1 = (Dali::Property::Array *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (bool)((Dali::Property::Map const *)arg1)->Empty();
+      result = (Dali::Property::Value *)new Dali::Property::Value(*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  char *arg2 = (char *) 0 ;
-  Dali::Property::Value *arg3 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_15(void * jarg1) {
+  void * jresult ;
+  Dali::Property::Map *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
   arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (char *)jarg2;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return ;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->Insert((char const *)arg2,(Dali::Property::Value const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Value *)new Dali::Property::Value(*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value *arg3 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_16(void * jarg1) {
+  void * jresult ;
+  Extents *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return ;
+  arg1 = (Extents *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Extents const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->Insert(arg2,(Dali::Property::Value const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Value *)new Dali::Property::Value((Extents const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void*) result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_17(int jarg1) {
   void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  char *arg2 = (char *) 0 ;
-  Dali::Property::Value *arg3 = 0 ;
-  Dali::Property::Map *result = 0 ;
+  Dali::Property::Type arg1 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (char *)jarg2;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Property::Type)jarg1;
   {
     try {
-      result = (Dali::Property::Map *) &(arg1)->Add((char const *)arg2,(Dali::Property::Value const &)*arg3);
+      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6513,23 +6325,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_18(void * jarg1) {
   void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value *arg3 = 0 ;
-  Dali::Property::Map *result = 0 ;
+  Dali::Property::Value *arg1 = 0 ;
+  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
+  arg1 = (Dali::Property::Value *)jarg1;
+  if (!arg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Map *) &(arg1)->Add(arg2,(Dali::Property::Value const &)*arg3);
+      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Property::Value const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6538,461 +6346,556 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetValue(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map::SizeType arg2 ;
-  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map::SizeType)jarg2;
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_EqualTo(void * jarg1, void * jarg2) {
+  bool jresult;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Property::Value *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Property::Value *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->GetValue(arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->operator ==((Dali::Property::Value const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_NotEqualTo(void * jarg1, void * jarg2) {
+  bool jresult;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Property::Value *arg2 = 0 ;
+  bool result;
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Map_GetKey(void * jarg1, unsigned long jarg2) {
-  char * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map::SizeType arg2 ;
-  std::string *result = 0 ;
-
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map::SizeType)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Property::Value *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (std::string *) &((Dali::Property::Map const *)arg1)->GetKey(arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->operator !=((Dali::Property::Value const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback(result->c_str());
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Value(void * jarg1) {
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetKeyAt(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map::SizeType arg2 ;
-  SwigValueWrapper< Dali::Property::Key > result;
+  arg1 = (Dali::Property::Value *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map::SizeType)jarg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Value_GetType(void * jarg1) {
+  int jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Property::Type result;
+
+  arg1 = (Dali::Property::Value *)jarg1;
   {
     try {
-      result = ((Dali::Property::Map const *)arg1)->GetKeyAt(arg2);
+      result = (Dali::Property::Type)((Dali::Property::Value const *)arg1)->GetType();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Property::Key((const Dali::Property::Key &)result);
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetPair(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map::SizeType arg2 ;
-  StringValuePair *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_1(void * jarg1, bool * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  bool *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map::SizeType)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (bool *)jarg2;
   {
     try {
-      result = (StringValuePair *) &((Dali::Property::Map const *)arg1)->GetPair(arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_0(void * jarg1, char * jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  char *arg2 = (char *) 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_2(void * jarg1, float * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  float *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (char *)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (float *)jarg2;
   {
     try {
-      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find((char const *)arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_2(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_3(void * jarg1, int * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  int *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (int *)jarg2;
   {
     try {
-      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find(arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_3(void * jarg1, int jarg2, char * jarg3) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  std::string *arg3 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_4(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Rect< int > *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  if (!jarg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Rect< int > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > & type is null", 0);
     return 0;
   }
-  std::string arg3_str(jarg3);
-  arg3 = &arg3_str;
   {
     try {
-      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find(arg2,(std::string const &)*arg3);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_4(void * jarg1, char * jarg2, int jarg3) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Type arg3 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_5(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Vector2 *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Type)jarg3;
   {
     try {
-      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find((std::string const &)*arg2,arg3);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_5(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Type arg3 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_6(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (Dali::Property::Type)jarg3;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Property::Value *)((Dali::Property::Map const *)arg1)->Find(arg2,arg3);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Clear(void * jarg1) {
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_7(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Vector4 *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Vector4 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->Clear();
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Remove__SWIG_0(void * map, int key) {
-  Dali::Property::Map *propertyMap = (Dali::Property::Map *)map;
-  Dali::Property::Index intKey = (Dali::Property::Index)key;
-  bool isRemoved = false;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_8(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Matrix3 *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Matrix3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 & type is null", 0);
+    return 0;
+  }
   {
     try {
-      isRemoved = propertyMap->Remove(intKey);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
-  return isRemoved;
+
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Map_Remove__SWIG_1(void * map, char * key) {
-  Dali::Property::Map *propertyMap = (Dali::Property::Map *)map;
-  std::string strKey(key);
-  bool isRemoved = false;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_9(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Matrix *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Matrix *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
+    return 0;
+  }
   {
     try {
-      isRemoved = propertyMap->Remove(strKey);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
-  return isRemoved;
+
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Merge(void * jarg1, void * jarg2) {
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map *arg2 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_10(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::AngleAxis *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map *)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::AngleAxis *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
-    return ;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->Merge((Dali::Property::Map const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_0(void * jarg1, char * jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_11(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Quaternion *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Quaternion *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
   {
     try {
-      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->operator []((std::string const &)*arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_2(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_12(void * jarg1, char** jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  std::string *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::Property::Value *)jarg1;
+
+  //typemap in
+  std::string temp;
+  arg2 = &temp;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      result = (Dali::Property::Value *) &((Dali::Property::Map const *)arg1)->operator [](arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
+
+  //Typemap argout in c++ file.
+  //This will convert c++ string to c# string
+  *jarg2 = SWIG_csharp_string_callback(arg2->c_str());
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
-  Dali::Property::Map *arg2 = 0 ;
-  Dali::Property::Map *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_13(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Property::Array *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  arg2 = (Dali::Property::Map *)jarg2;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Property::Array *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Map *) &(arg1)->operator =((Dali::Property::Map const &)*arg2);
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_SetValue_StringKey(void* jarg1, char* jarg2, void* jarg3) {
-
-  Dali::Property::Map* arg1 = (Dali::Property::Map*)jarg1;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_14(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Dali::Property::Map *arg2 = 0 ;
+  bool result;
 
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return;
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Dali::Property::Map *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
+    return 0;
   }
-  std::string arg2_str(jarg2);
-  std::string* arg2 = &arg2_str;
-
-  Dali::Property::Value* arg3 = (Dali::Property::Value*)jarg3;
-
   {
     try {
-      arg1->operator[]((std::string const &)*arg2) = *arg3;
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
-}
 
+  jresult = result;
+  return jresult;
+}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_SetValue_IntKey(void* jarg1, int jarg2, void* jarg3) {
 
-  Dali::Property::Map* arg1 = (Dali::Property::Map*)jarg1;
-  Dali::Property::Index arg2 = (Dali::Property::Index)jarg2;
-  Dali::Property::Value* arg3 = (Dali::Property::Value*)jarg3;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_15(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
+  Extents *arg2 = 0 ;
+  bool result;
 
+  arg1 = (Dali::Property::Value *)jarg1;
+  arg2 = (Extents *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Extents & type is null", 0);
+    return 0;
+  }
   {
     try {
-      arg1->operator[](arg2) = *arg3;
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_0() {
-  void * jresult ;
-  Dali::Property::Value *result = 0 ;
 
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetName(int jarg1) {
+  char * jresult ;
+  Dali::Property::Type arg1 ;
+  char *result = 0 ;
+
+  arg1 = (Dali::Property::Type)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value();
+      result = (char *)Dali::PropertyTypes::GetName(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = SWIG_csharp_string_callback((const char *)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_1(bool jarg1) {
-  void * jresult ;
-  bool arg1 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_DoAction(void * jarg1, char * jarg2, void * jarg3) {
+  bool jresult ;
+  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Map *arg3 = 0 ;
+  bool result;
 
-  arg1 = jarg1 ? true : false;
+  arg1 = (Dali::BaseObject *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Map *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
+      result = (bool)(arg1)->DoAction((std::string const &)*arg2,(Dali::Property::Map const &)*arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_2(int jarg1) {
-  void * jresult ;
-  int arg1 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeName(void * jarg1) {
+  char * jresult ;
+  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
+  std::string *result = 0 ;
 
-  arg1 = (int)jarg1;
+  arg1 = (Dali::BaseObject *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
+      result = (std::string *) &((Dali::BaseObject const *)arg1)->GetTypeName();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = SWIG_csharp_string_callback(result->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_3(float jarg1) {
-  void * jresult ;
-  float arg1 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeInfo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
+  Dali::TypeInfo *arg2 = 0 ;
+  bool result;
 
-  arg1 = (float)jarg1;
+  arg1 = (Dali::BaseObject *)jarg1;
+  arg2 = (Dali::TypeInfo *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
+      result = (bool)((Dali::BaseObject const *)arg1)->GetTypeInfo(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_4(void * jarg1) {
-  void * jresult ;
-  Dali::Vector2 *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_DoConnectSignal(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
+  bool jresult ;
+  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
+  ConnectionTrackerInterface *arg2 = (ConnectionTrackerInterface *) 0 ;
+  std::string *arg3 = 0 ;
+  FunctorDelegate *arg4 = (FunctorDelegate *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Vector2 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+  arg1 = (Dali::BaseObject *)jarg1;
+  arg2 = (ConnectionTrackerInterface *)jarg2;
+  if (!jarg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
+  std::string arg3_str(jarg3);
+  arg3 = &arg3_str;
+  arg4 = (FunctorDelegate *)jarg4;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector2 const &)*arg1);
+      result = (bool)(arg1)->DoConnectSignal(arg2,(std::string const &)*arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_5(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetImplementation(void * jarg1) {
   void * jresult ;
-  Dali::Vector3 *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+  Dali::BaseHandle *arg1 = 0 ;
+  Dali::BaseObject *result = 0 ;
 
-  arg1 = (Dali::Vector3 *)jarg1;
+  arg1 = (Dali::BaseHandle *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector3 const &)*arg1);
+      result = (Dali::BaseObject *) &Dali::GetImplementation((Dali::BaseHandle const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -7001,19 +6904,15 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_5(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_6(void * jarg1) {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_1() {
   void * jresult ;
-  Dali::Vector4 *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+  Dali::BaseHandle *result = 0 ;
 
-  arg1 = (Dali::Vector4 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Vector4 const &)*arg1);
+      result = (Dali::BaseHandle *)new Dali::BaseHandle();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -7022,40 +6921,32 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_6(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_7(void * jarg1) {
-  void * jresult ;
-  Dali::Matrix3 *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_BaseHandle(void * jarg1) {
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
 
-  arg1 = (Dali::Matrix3 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::BaseHandle *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Matrix3 const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_8(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_2(void * jarg1) {
   void * jresult ;
-  Dali::Matrix *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+  Dali::BaseHandle *arg1 = 0 ;
+  Dali::BaseHandle *result = 0 ;
 
-  arg1 = (Dali::Matrix *)jarg1;
+  arg1 = (Dali::BaseHandle *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Matrix const &)*arg1);
+      result = (Dali::BaseHandle *)new Dali::BaseHandle((Dali::BaseHandle const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -7064,266 +6955,269 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_8(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_9(void * jarg1) {
-  void * jresult ;
-  Dali::Rect< int > *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_DoAction(void * jarg1, char * jarg2, void * jarg3) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Map *arg3 = 0 ;
+  bool result;
+
+  arg1 = (Dali::BaseHandle *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Map *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Rect< int > const &)*arg1);
+      result = (bool)(arg1)->DoAction((std::string const &)*arg2,(Dali::Property::Map const &)*arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_10(void * jarg1) {
-  void * jresult ;
-  Dali::AngleAxis *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeName(void * jarg1) {
+  char * jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  std::string *result = 0 ;
 
-  arg1 = (Dali::AngleAxis *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::BaseHandle *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::AngleAxis const &)*arg1);
+      result = (std::string *) &((Dali::BaseHandle const *)arg1)->GetTypeName();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = SWIG_csharp_string_callback(result->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_11(void * jarg1) {
-  void * jresult ;
-  Dali::Quaternion *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeInfo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::TypeInfo *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Quaternion *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion const & type is null", 0);
+  arg1 = (Dali::BaseHandle *)jarg1;
+  arg2 = (Dali::TypeInfo *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Quaternion const &)*arg1);
+      result = (bool)((Dali::BaseHandle const *)arg1)->GetTypeInfo(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_12(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetBaseObject__SWIG_0(void * jarg1) {
   void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::BaseObject *result = 0 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
+  arg1 = (Dali::BaseHandle *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((std::string const &)*arg1);
+      result = (Dali::BaseObject *) &(arg1)->GetBaseObject();
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_14(void * jarg1) {
-  void * jresult ;
-  Dali::Property::Array *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Array *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array & type is null", 0);
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_EqualTo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::BaseHandle *arg2 = 0 ;
+  bool result;
+
+  arg1 = (Dali::BaseHandle *)jarg1;
+  arg2 = (Dali::BaseHandle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(*arg1);
+      result = (bool)((Dali::BaseHandle const *)arg1)->operator ==((Dali::BaseHandle const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_15(void * jarg1) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_NotEqualTo(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::BaseHandle *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
+  arg1 = (Dali::BaseHandle *)jarg1;
+  arg2 = (Dali::BaseHandle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(*arg1);
+      result = (bool)((Dali::BaseHandle const *)arg1)->operator !=((Dali::BaseHandle const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_16(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetObjectPtr(void * jarg1) {
   void * jresult ;
-  Extents *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::RefObject *result = 0 ;
 
-  arg1 = (Extents *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Extents const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::BaseHandle *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Extents const &)*arg1);
+      result = (Dali::RefObject *)((Dali::BaseHandle const *)arg1)->GetObjectPtr();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void*) result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_17(int jarg1) {
-  void * jresult ;
-  Dali::Property::Type arg1 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_HasBody(void * jarg1) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Type)jarg1;
+  arg1 = (Dali::BaseHandle *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value(arg1);
+      result = (bool)Dali_BaseHandle_HasBody((Dali::BaseHandle const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_18(void * jarg1) {
-  void * jresult ;
-  Dali::Property::Value *arg1 = 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_IsEqual(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+  Dali::BaseHandle *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+  arg1 = (Dali::BaseHandle *)jarg1;
+  arg2 = (Dali::BaseHandle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Property::Value *)new Dali::Property::Value((Dali::Property::Value const &)*arg1);
+      result = (bool)Dali_BaseHandle_IsEqual((Dali::BaseHandle const *)arg1,(Dali::BaseHandle const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Value *arg2 = 0 ;
-  Dali::Property::Value *result = 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
-  }
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTrackerInterface(void * jarg1) {
+  Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
+
+  arg1 = (Dali::ConnectionTrackerInterface *)jarg1;
   {
     try {
-      result = (Dali::Property::Value *) &(arg1)->operator =((Dali::Property::Value const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_EqualTo(void * jarg1, void * jarg2) {
-  bool jresult;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Value *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTrackerInterface_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
+  SlotObserver *arg2 = (SlotObserver *) 0 ;
+  CallbackBase *arg3 = (CallbackBase *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ConnectionTrackerInterface *)jarg1;
+  arg2 = (SlotObserver *)jarg2;
+  arg3 = (CallbackBase *)jarg3;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->operator ==((Dali::Property::Value const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SignalConnected(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_NotEqualTo(void * jarg1, void * jarg2) {
-  bool jresult;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Value *arg2 = 0 ;
-  bool result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalObserver(void * jarg1) {
+  Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
+
+  arg1 = (Dali::SignalObserver *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SignalObserver_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
+  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
+  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
+
+  arg1 = (Dali::SignalObserver *)jarg1;
+  arg2 = (Dali::SlotObserver *)jarg2;
+  arg3 = (Dali::CallbackBase *)jarg3;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->operator !=((Dali::Property::Value const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SignalDisconnected(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Value(void * jarg1) {
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SlotObserver(void * jarg1) {
+  Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
+
+  arg1 = (Dali::SlotObserver *)jarg1;
   {
     try {
       delete arg1;
@@ -7333,544 +7227,404 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Value(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Value_GetType(void * jarg1) {
-  int jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Type result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SlotObserver_SlotDisconnected(void * jarg1, void * jarg2) {
+  Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
+  Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
+  arg1 = (Dali::SlotObserver *)jarg1;
+  arg2 = (Dali::CallbackBase *)jarg2;
   {
     try {
-      result = (Dali::Property::Type)((Dali::Property::Value const *)arg1)->GetType();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SlotDisconnected(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_1(void * jarg1, bool * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  bool *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTracker(void * jarg1) {
+  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (bool *)jarg2;
+  arg1 = (Dali::ConnectionTracker *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_2(void * jarg1, float * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  float *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_DisconnectAll(void * jarg1) {
+  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (float *)jarg2;
+  arg1 = (Dali::ConnectionTracker *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->DisconnectAll();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_3(void * jarg1, int * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  int *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
+  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
+  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (int *)jarg2;
+  arg1 = (Dali::ConnectionTracker *)jarg1;
+  arg2 = (Dali::SlotObserver *)jarg2;
+  arg3 = (Dali::CallbackBase *)jarg3;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SignalConnected(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_4(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Rect< int > *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
+  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
+  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Rect< int > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ConnectionTracker *)jarg1;
+  arg2 = (Dali::SlotObserver *)jarg2;
+  arg3 = (Dali::CallbackBase *)jarg3;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SignalDisconnected(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_5(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  bool result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ConnectionTracker_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ConnectionTracker *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = ((Dali::ConnectionTracker const *)arg1)->GetConnectionCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_6(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectRegistry__SWIG_0() {
+  void * jresult ;
+  Dali::ObjectRegistry *result = 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (Dali::ObjectRegistry *)new Dali::ObjectRegistry();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_7(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectRegistry(void * jarg1) {
+  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ObjectRegistry *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_8(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Matrix3 *arg2 = 0 ;
-  bool result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Matrix3 *)jarg2;
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_Assign(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
+  Dali::ObjectRegistry *arg2 = 0 ;
+  Dali::ObjectRegistry *result = 0 ;
+
+  arg1 = (Dali::ObjectRegistry *)jarg1;
+  arg2 = (Dali::ObjectRegistry *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::ObjectRegistry const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (Dali::ObjectRegistry *) &(arg1)->operator =((Dali::ObjectRegistry const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_9(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Matrix *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectCreatedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
+  Dali::ObjectRegistry::ObjectCreatedSignalType *result = 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Matrix *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ObjectRegistry *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (Dali::ObjectRegistry::ObjectCreatedSignalType *) &(arg1)->ObjectCreatedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_10(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::AngleAxis *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectDestroyedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
+  Dali::ObjectRegistry::ObjectDestroyedSignalType *result = 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::AngleAxis *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::AngleAxis & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::ObjectRegistry *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (Dali::ObjectRegistry::ObjectDestroyedSignalType *) &(arg1)->ObjectDestroyedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_11(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Quaternion *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyCondition__SWIG_0() {
+  void * jresult ;
+  Dali::PropertyCondition *result = 0 ;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Quaternion *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Quaternion & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (Dali::PropertyCondition *)new Dali::PropertyCondition();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_12(void * jarg1, char** jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  std::string *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::Property::Value *)jarg1;
-
-  //typemap in
-  std::string temp;
-  arg2 = &temp;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyCondition(void * jarg1) {
+  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
 
+  arg1 = (Dali::PropertyCondition *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-
-  //Typemap argout in c++ file.
-  //This will convert c++ string to c# string
-  *jarg2 = SWIG_csharp_string_callback(arg2->c_str());
-
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_13(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Array *arg2 = 0 ;
-  bool result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Property::Array *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Array & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_14(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Map *arg2 = 0 ;
-  bool result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgumentCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Dali::Property::Map *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyCondition *)jarg1;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = ((Dali::PropertyCondition const *)arg1)->GetArgumentCount();
     } CALL_CATCH_EXCEPTION(0);
   }
-
-  jresult = result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_15(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Extents *arg2 = 0 ;
-  bool result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgument(void * jarg1, unsigned long jarg2) {
+  float jresult ;
+  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
+  std::size_t arg2 ;
+  float result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
-  arg2 = (Extents *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Extents & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyCondition *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (bool)((Dali::Property::Value const *)arg1)->Get(*arg2);
+      result = (float)((Dali::PropertyCondition const *)arg1)->GetArgument(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
   jresult = result;
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_GetArray(void * jarg1) {
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LessThanCondition(float jarg1) {
   void * jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Array *result = 0 ;
+  float arg1 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
+  arg1 = (float)jarg1;
   {
     try {
-      result = (Dali::Property::Array *)((Dali::Property::Value const *)arg1)->GetArray();
+      result = Dali::LessThanCondition(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_GetMap(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GreaterThanCondition(float jarg1) {
   void * jresult ;
-  Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
-  Dali::Property::Map *result = 0 ;
+  float arg1 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::Property::Value *)jarg1;
+  arg1 = (float)jarg1;
   {
     try {
-      result = (Dali::Property::Map *)((Dali::Property::Value const *)arg1)->GetMap();
+      result = Dali::GreaterThanCondition(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetName(int jarg1) {
-  char * jresult ;
-  Dali::Property::Type arg1 ;
-  char *result = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_InsideCondition(float jarg1, float jarg2) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::Property::Type)jarg1;
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (char *)Dali::PropertyTypes::GetName(arg1);
+      result = Dali::InsideCondition(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback((const char *)result);
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_DoAction(void * jarg1, char * jarg2, void * jarg3) {
-  bool jresult ;
-  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Map *arg3 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_OutsideCondition(float jarg1, float jarg2) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::BaseObject *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Map *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (bool)(arg1)->DoAction((std::string const &)*arg2,(Dali::Property::Map const &)*arg3);
+      result = Dali::OutsideCondition(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
-
-  //argout typemap for const std::string&
-
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeName(void * jarg1) {
-  char * jresult ;
-  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
-  std::string *result = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_0(float jarg1, float jarg2) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::BaseObject *)jarg1;
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (std::string *) &((Dali::BaseObject const *)arg1)->GetTypeName();
+      result = Dali::StepCondition(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback(result->c_str());
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeInfo(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
-  Dali::TypeInfo *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_1(float jarg1) {
+  void * jresult ;
+  float arg1 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::BaseObject *)jarg1;
-  arg2 = (Dali::TypeInfo *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo & type is null", 0);
-    return 0;
-  }
+  arg1 = (float)jarg1;
   {
     try {
-      result = (bool)((Dali::BaseObject const *)arg1)->GetTypeInfo(*arg2);
+      result = Dali::StepCondition(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseObject_DoConnectSignal(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
-  bool jresult ;
-  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
-  ConnectionTrackerInterface *arg2 = (ConnectionTrackerInterface *) 0 ;
-  std::string *arg3 = 0 ;
-  FunctorDelegate *arg4 = (FunctorDelegate *) 0 ;
-  bool result;
 
-  arg1 = (Dali::BaseObject *)jarg1;
-  arg2 = (ConnectionTrackerInterface *)jarg2;
-  if (!jarg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg3_str(jarg3);
-  arg3 = &arg3_str;
-  arg4 = (FunctorDelegate *)jarg4;
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_0() {
+  void * jresult ;
+  Dali::PropertyNotification *result = 0 ;
+
   {
     try {
-      result = (bool)(arg1)->DoConnectSignal(arg2,(std::string const &)*arg3,arg4);
+      result = (Dali::PropertyNotification *)new Dali::PropertyNotification();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
-
-  //argout typemap for const std::string&
-
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetImplementation(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle *arg1 = 0 ;
-  Dali::BaseObject *result = 0 ;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotification(void * jarg1) {
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (Dali::BaseObject *) &Dali::GetImplementation((Dali::BaseHandle const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
-  Dali::BaseHandle *result = 0 ;
+  Dali::PropertyNotification *arg1 = 0 ;
+  Dali::PropertyNotification *result = 0 ;
 
-  arg1 = (Dali::BaseObject *)jarg1;
+  arg1 = (Dali::PropertyNotification *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::BaseHandle *)new Dali::BaseHandle(arg1);
+      result = (Dali::PropertyNotification *)new Dali::PropertyNotification((Dali::PropertyNotification const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -7879,13 +7633,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_1() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::BaseHandle *result = 0 ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::PropertyNotification *arg2 = 0 ;
+  Dali::PropertyNotification *result = 0 ;
 
+  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg2 = (Dali::PropertyNotification *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::BaseHandle *)new Dali::BaseHandle();
+      result = (Dali::PropertyNotification *) &(arg1)->operator =((Dali::PropertyNotification const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -7894,128 +7656,98 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_1() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_BaseHandle(void * jarg1) {
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetCondition__SWIG_0(void * jarg1) {
+  void * jresult ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::PropertyCondition result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->GetCondition();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTarget(void * jarg1) {
   void * jresult ;
-  Dali::BaseHandle *arg1 = 0 ;
-  Dali::BaseHandle *result = 0 ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::Handle result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (Dali::BaseHandle *)new Dali::BaseHandle((Dali::BaseHandle const &)*arg1);
+      result = ((Dali::PropertyNotification const *)arg1)->GetTarget();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Handle((const Dali::Handle &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::BaseHandle *arg2 = 0 ;
-  Dali::BaseHandle *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTargetProperty(void * jarg1) {
+  int jresult ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::Property::Index result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  arg2 = (Dali::BaseHandle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (Dali::BaseHandle *) &(arg1)->operator =((Dali::BaseHandle const &)*arg2);
+      result = (Dali::Property::Index)((Dali::PropertyNotification const *)arg1)->GetTargetProperty();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_DoAction(void * jarg1, char * jarg2, void * jarg3) {
-  bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Map *arg3 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotification_SetNotifyMode(void * jarg1, int jarg2) {
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::PropertyNotification::NotifyMode arg2 ;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Map *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg2 = (Dali::PropertyNotification::NotifyMode)jarg2;
   {
     try {
-      result = (bool)(arg1)->DoAction((std::string const &)*arg2,(Dali::Property::Map const &)*arg3);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetNotifyMode(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-
-  //argout typemap for const std::string&
-
-  return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeName(void * jarg1) {
-  char * jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  std::string *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyMode(void * jarg1) {
+  int jresult ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::PropertyNotification::NotifyMode result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (std::string *) &((Dali::BaseHandle const *)arg1)->GetTypeName();
+      result = (Dali::PropertyNotification::NotifyMode)(arg1)->GetNotifyMode();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback(result->c_str());
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeInfo(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyResult(void * jarg1) {
   bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::TypeInfo *arg2 = 0 ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   bool result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  arg2 = (Dali::TypeInfo *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (bool)((Dali::BaseHandle const *)arg1)->GetTypeInfo(*arg2);
+      result = (bool)((Dali::PropertyNotification const *)arg1)->GetNotifyResult();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8024,15 +7756,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeInfo(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetBaseObject__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_NotifySignal(void * jarg1) {
   void * jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::BaseObject *result = 0 ;
+  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
+  Dali::PropertyNotifySignalType *result = 0 ;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
+  arg1 = (Dali::PropertyNotification *)jarg1;
   {
     try {
-      result = (Dali::BaseObject *) &(arg1)->GetBaseObject();
+      result = (Dali::PropertyNotifySignalType *) &(arg1)->NotifySignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8041,141 +7773,118 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetBaseObject__SWIG_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BaseHandle_Reset(void * jarg1) {
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-
-  arg1 = (Dali::BaseHandle *)jarg1;
-  {
-    try {
-      (arg1)->Reset();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_EqualTo(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::BaseHandle *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_New() {
+  void * jresult ;
+  Dali::Handle result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  arg2 = (Dali::BaseHandle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (bool)((Dali::BaseHandle const *)arg1)->operator ==((Dali::BaseHandle const &)*arg2);
+      result = Dali::Handle::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Handle((const Dali::Handle &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_NotEqualTo(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::BaseHandle *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Handle(void * jarg1) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  arg2 = (Dali::BaseHandle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Handle *)jarg1;
   {
     try {
-      result = (bool)((Dali::BaseHandle const *)arg1)->operator !=((Dali::BaseHandle const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetObjectPtr(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::RefObject *result = 0 ;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
+
+
+
+
+
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyCount(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  unsigned int result;
+
+  arg1 = (Dali::Handle *)jarg1;
   {
     try {
-      result = (Dali::RefObject *)((Dali::BaseHandle const *)arg1)->GetObjectPtr();
+      result = (unsigned int)((Dali::Handle const *)arg1)->GetPropertyCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_HasBody(void * jarg1) {
-  bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  bool result;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Handle_GetPropertyName(void * jarg1, int jarg2) {
+  char * jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  std::string result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      result = (bool)Dali_BaseHandle_HasBody((Dali::BaseHandle const *)arg1);
+      result = ((Dali::Handle const *)arg1)->GetPropertyName(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = SWIG_csharp_string_callback((&result)->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_BaseHandle_IsEqual(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
-  Dali::BaseHandle *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::BaseHandle *)jarg1;
-  arg2 = (Dali::BaseHandle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndex(void * jarg1, char * jarg2) {
+  int jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index result;
+
+  arg1 = (Dali::Handle *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
   {
     try {
-      result = (bool)Dali_BaseHandle_IsEqual((Dali::BaseHandle const *)arg1,(Dali::BaseHandle const &)*arg2);
+      result = (Dali::Property::Index)((Dali::Handle const *)arg1)->GetPropertyIndex((std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_IsPropertyWritable(void * jarg1, int jarg2) {
   bool jresult ;
-  Dali::BaseHandle *arg1 = 0 ;
-  Dali::BaseHandle *arg2 = 0 ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
   bool result;
 
-  arg1 = (Dali::BaseHandle *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::BaseHandle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::BaseHandle const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      result = (bool)Dali::operator <((Dali::BaseHandle const &)*arg1,(Dali::BaseHandle const &)*arg2);
+      result = (bool)((Dali::Handle const *)arg1)->IsPropertyWritable(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8184,235 +7893,298 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LessThan__SWIG_3(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTrackerInterface(void * jarg1) {
-  Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_IsPropertyAnimatable(void * jarg1, int jarg2) {
+  bool jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  bool result;
 
-  arg1 = (Dali::ConnectionTrackerInterface *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Handle const *)arg1)->IsPropertyAnimatable(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTrackerInterface_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
-  SlotObserver *arg2 = (SlotObserver *) 0 ;
-  CallbackBase *arg3 = (CallbackBase *) 0 ;
-
-  arg1 = (Dali::ConnectionTrackerInterface *)jarg1;
-  arg2 = (SlotObserver *)jarg2;
-  arg3 = (CallbackBase *)jarg3;
-  {
-    try {
-      (arg1)->SignalConnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalObserver(void * jarg1) {
-  Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyType(void * jarg1, int jarg2) {
+  int jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Type result;
 
-  arg1 = (Dali::SignalObserver *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Type)((Dali::Handle const *)arg1)->GetPropertyType(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SignalObserver_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_SetProperty(void * jarg1, int jarg2, void * jarg3) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value *arg3 = 0 ;
 
-  arg1 = (Dali::SignalObserver *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return ;
+  }
   {
     try {
-      (arg1)->SignalDisconnected(arg2,arg3);
+      (arg1)->SetProperty(arg2,(Dali::Property::Value const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SlotObserver(void * jarg1) {
-  Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Value *arg3 = 0 ;
+  Dali::Property::Index result;
 
-  arg1 = (Dali::SlotObserver *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Index)(arg1)->RegisterProperty((std::string const &)*arg2,(Dali::Property::Value const &)*arg3);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+
+  //argout typemap for const std::string&
+
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SlotObserver_SlotDisconnected(void * jarg1, void * jarg2) {
-  Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_1(void * jarg1, char * jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Value *arg3 = 0 ;
+  Dali::Property::AccessMode arg4 ;
+  Dali::Property::Index result;
 
-  arg1 = (Dali::SlotObserver *)jarg1;
-  arg2 = (Dali::CallbackBase *)jarg2;
+  arg1 = (Dali::Handle *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Value *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
+  arg4 = (Dali::Property::AccessMode)jarg4;
   {
     try {
-      (arg1)->SlotDisconnected(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Property::Index)(arg1)->RegisterProperty((std::string const &)*arg2,(Dali::Property::Value const &)*arg3,arg4);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+
+  //argout typemap for const std::string&
+
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTracker(void * jarg1) {
-  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_GetProperty(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value result;
 
-  arg1 = (Dali::ConnectionTracker *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::Handle const *)arg1)->GetProperty(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Property::Value((const Dali::Property::Value &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_DisconnectAll(void * jarg1) {
-  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_GetCurrentProperty(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::Property::Value result;
 
-  arg1 = (Dali::ConnectionTracker *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      (arg1)->DisconnectAll();
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::Handle const *)arg1)->GetCurrentProperty(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Property::Value((const Dali::Property::Value &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::ConnectionTracker *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_0(void * jarg1, int jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  Dali::PropertyCondition *arg3 = 0 ;
+  Dali::PropertyNotification result;
+
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (Dali::PropertyCondition *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->SignalConnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->AddPropertyNotification(arg2,(Dali::PropertyCondition const &)*arg3);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::PropertyNotification((const Dali::PropertyNotification &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_1(void * jarg1, int jarg2, int jarg3, void * jarg4) {
+  void * jresult ;
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::Property::Index arg2 ;
+  int arg3 ;
+  Dali::PropertyCondition *arg4 = 0 ;
+  Dali::PropertyNotification result;
 
-  arg1 = (Dali::ConnectionTracker *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
+  arg3 = (int)jarg3;
+  arg4 = (Dali::PropertyCondition *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->SignalDisconnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->AddPropertyNotification(arg2,arg3,(Dali::PropertyCondition const &)*arg4);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::PropertyNotification((const Dali::PropertyNotification &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ConnectionTracker_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
-  std::size_t result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotification(void * jarg1, void * jarg2) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  Dali::PropertyNotification arg2 ;
+  Dali::PropertyNotification *argp2 ;
 
-  arg1 = (Dali::ConnectionTracker *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
+  argp2 = (Dali::PropertyNotification *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PropertyNotification", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = ((Dali::ConnectionTracker const *)arg1)->GetConnectionCount();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->RemovePropertyNotification(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectRegistry__SWIG_0() {
-  void * jresult ;
-  Dali::ObjectRegistry *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotifications(void * jarg1) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
 
+  arg1 = (Dali::Handle *)jarg1;
   {
     try {
-      result = (Dali::ObjectRegistry *)new Dali::ObjectRegistry();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->RemovePropertyNotifications();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectRegistry(void * jarg1) {
-  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_0(void * jarg1) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
 
-  arg1 = (Dali::ObjectRegistry *)jarg1;
+  arg1 = (Dali::Handle *)jarg1;
   {
     try {
-      delete arg1;
+      (arg1)->RemoveConstraints();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectRegistry__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::ObjectRegistry *arg1 = 0 ;
-  Dali::ObjectRegistry *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_1(void * jarg1, unsigned int jarg2) {
+  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (Dali::ObjectRegistry *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::ObjectRegistry const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Handle *)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      result = (Dali::ObjectRegistry *)new Dali::ObjectRegistry((Dali::ObjectRegistry const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->RemoveConstraints(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_Assign(void * jarg1, void * jarg2) {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_0() {
   void * jresult ;
-  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
-  Dali::ObjectRegistry *arg2 = 0 ;
-  Dali::ObjectRegistry *result = 0 ;
+  Dali::TypeInfo *result = 0 ;
 
-  arg1 = (Dali::ObjectRegistry *)jarg1;
-  arg2 = (Dali::ObjectRegistry *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::ObjectRegistry const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (Dali::ObjectRegistry *) &(arg1)->operator =((Dali::ObjectRegistry const &)*arg2);
+      result = (Dali::TypeInfo *)new Dali::TypeInfo();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8421,32 +8193,32 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_Assign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectCreatedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
-  Dali::ObjectRegistry::ObjectCreatedSignalType *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeInfo(void * jarg1) {
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
 
-  arg1 = (Dali::ObjectRegistry *)jarg1;
+  arg1 = (Dali::TypeInfo *)jarg1;
   {
     try {
-      result = (Dali::ObjectRegistry::ObjectCreatedSignalType *) &(arg1)->ObjectCreatedSignal();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectDestroyedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
-  Dali::ObjectRegistry::ObjectDestroyedSignalType *result = 0 ;
+  Dali::TypeInfo *arg1 = 0 ;
+  Dali::TypeInfo *result = 0 ;
 
-  arg1 = (Dali::ObjectRegistry *)jarg1;
+  arg1 = (Dali::TypeInfo *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::ObjectRegistry::ObjectDestroyedSignalType *) &(arg1)->ObjectDestroyedSignal();
+      result = (Dali::TypeInfo *)new Dali::TypeInfo((Dali::TypeInfo const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8455,305 +8227,299 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectDestroyedSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyCondition__SWIG_0() {
-  void * jresult ;
-  Dali::PropertyCondition *result = 0 ;
 
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetName(void * jarg1) {
+  char * jresult ;
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+  std::string *result = 0 ;
+
+  arg1 = (Dali::TypeInfo *)jarg1;
   {
     try {
-      result = (Dali::PropertyCondition *)new Dali::PropertyCondition();
+      result = (std::string *) &((Dali::TypeInfo const *)arg1)->GetName();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = SWIG_csharp_string_callback(result->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyCondition(void * jarg1) {
-  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetBaseName(void * jarg1) {
+  char * jresult ;
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+  std::string *result = 0 ;
 
-  arg1 = (Dali::PropertyCondition *)jarg1;
+  arg1 = (Dali::TypeInfo *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (std::string *) &((Dali::TypeInfo const *)arg1)->GetBaseName();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = SWIG_csharp_string_callback(result->c_str());
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyCondition__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeInfo_CreateInstance(void * jarg1) {
   void * jresult ;
-  Dali::PropertyCondition *arg1 = 0 ;
-  Dali::PropertyCondition *result = 0 ;
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+  Dali::BaseHandle result;
 
-  arg1 = (Dali::PropertyCondition *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TypeInfo *)jarg1;
   {
     try {
-      result = (Dali::PropertyCondition *)new Dali::PropertyCondition((Dali::PropertyCondition const &)*arg1);
+      result = ((Dali::TypeInfo const *)arg1)->CreateInstance();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::BaseHandle((const Dali::BaseHandle &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyCondition_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
-  Dali::PropertyCondition *arg2 = 0 ;
-  Dali::PropertyCondition *result = 0 ;
 
-  arg1 = (Dali::PropertyCondition *)jarg1;
-  arg2 = (Dali::PropertyCondition *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PropertyCondition *) &(arg1)->operator =((Dali::PropertyCondition const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgumentCount(void * jarg1) {
+
+
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
-  std::size_t result;
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+  size_t result;
 
-  arg1 = (Dali::PropertyCondition *)jarg1;
+  arg1 = (Dali::TypeInfo *)jarg1;
   {
     try {
-      result = ((Dali::PropertyCondition const *)arg1)->GetArgumentCount();
+      result = ((Dali::TypeInfo const *)arg1)->GetPropertyCount();
     } CALL_CATCH_EXCEPTION(0);
   }
+
   jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgument(void * jarg1, unsigned long jarg2) {
-  float jresult ;
-  Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
-  std::size_t arg2 ;
-  float result;
 
-  arg1 = (Dali::PropertyCondition *)jarg1;
-  arg2 = (std::size_t)jarg2;
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyName(void * jarg1, int jarg2) {
+  char * jresult ;
+  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+  Dali::Property::Index arg2 ;
+  std::string_view result;
+
+  arg1 = (Dali::TypeInfo *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   {
     try {
-      result = (float)((Dali::PropertyCondition const *)arg1)->GetArgument(arg2);
+      result = ((Dali::TypeInfo const *)arg1)->GetPropertyName(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = result;
+
+  jresult = SWIG_csharp_string_callback(result.data());
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LessThanCondition(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Get() {
   void * jresult ;
-  float arg1 ;
-  Dali::PropertyCondition result;
+  Dali::TypeRegistry result;
 
-  arg1 = (float)jarg1;
   {
     try {
-      result = Dali::LessThanCondition(arg1);
+      result = Dali::TypeRegistry::Get();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = new Dali::TypeRegistry((const Dali::TypeRegistry &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GreaterThanCondition(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_0() {
   void * jresult ;
-  float arg1 ;
-  Dali::PropertyCondition result;
+  Dali::TypeRegistry *result = 0 ;
 
-  arg1 = (float)jarg1;
   {
     try {
-      result = Dali::GreaterThanCondition(arg1);
+      result = (Dali::TypeRegistry *)new Dali::TypeRegistry();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_InsideCondition(float jarg1, float jarg2) {
-  void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  Dali::PropertyCondition result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistry(void * jarg1) {
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::TypeRegistry *)jarg1;
   {
     try {
-      result = Dali::InsideCondition(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_OutsideCondition(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_1(void * jarg1) {
   void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  Dali::PropertyCondition result;
+  Dali::TypeRegistry *arg1 = 0 ;
+  Dali::TypeRegistry *result = 0 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::TypeRegistry *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistry const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = Dali::OutsideCondition(arg1,arg2);
+      result = (Dali::TypeRegistry *)new Dali::TypeRegistry((Dali::TypeRegistry const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_0(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  Dali::PropertyCondition result;
-
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+  Dali::TypeRegistry *arg2 = 0 ;
+  Dali::TypeRegistry *result = 0 ;
+
+  arg1 = (Dali::TypeRegistry *)jarg1;
+  arg2 = (Dali::TypeRegistry *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistry const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = Dali::StepCondition(arg1,arg2);
+      result = (Dali::TypeRegistry *) &(arg1)->operator =((Dali::TypeRegistry const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_1(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
-  float arg1 ;
-  Dali::PropertyCondition result;
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::TypeInfo result;
 
-  arg1 = (float)jarg1;
+  arg1 = (Dali::TypeRegistry *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
   {
     try {
-      result = Dali::StepCondition(arg1);
+      result = (arg1)->GetTypeInfo((std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = new Dali::TypeInfo((const Dali::TypeInfo &)result);
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VariableStepCondition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *arg1 = 0 ;
-  Dali::PropertyCondition result;
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::TypeInfo result;
 
-  arg1 = (Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > const & type is null", 0);
+  arg1 = (Dali::TypeRegistry *)jarg1;
+  arg2 = (std::type_info *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = Dali::VariableStepCondition((Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > const &)*arg1);
+      result = (arg1)->GetTypeInfo((std::type_info const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = new Dali::TypeInfo((const Dali::TypeInfo &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_0() {
-  void * jresult ;
-  Dali::PropertyNotification *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeNameCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+  size_t result;
 
+  arg1 = (Dali::TypeRegistry *)jarg1;
   {
     try {
-      result = (Dali::PropertyNotification *)new Dali::PropertyNotification();
+      result = ((Dali::TypeRegistry const *)arg1)->GetTypeNameCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::PropertyNotification result;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeName(void * jarg1, unsigned long jarg2) {
+  char * jresult ;
+  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+  size_t arg2 ;
+  std::string result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
+  arg1 = (Dali::TypeRegistry *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      result = Dali::PropertyNotification::DownCast(arg1);
+      result = ((Dali::TypeRegistry const *)arg1)->GetTypeName(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyNotification((const Dali::PropertyNotification &)result);
+  jresult = SWIG_csharp_string_callback((&result)->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotification(void * jarg1) {
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-
-  arg1 = (Dali::PropertyNotification *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
-  Dali::PropertyNotification *arg1 = 0 ;
-  Dali::PropertyNotification *result = 0 ;
+  std::type_info *arg1 = 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
+  Dali::TypeRegistration *result = 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg1 = (std::type_info *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
     return 0;
   }
+  arg2 = (std::type_info *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
+    return 0;
+  }
+  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
   {
     try {
-      result = (Dali::PropertyNotification *)new Dali::PropertyNotification((Dali::PropertyNotification const &)*arg1);
+      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::type_info const &)*arg1,(std::type_info const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8762,21 +8528,29 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_1(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_1(void * jarg1, void * jarg2, void * jarg3, bool jarg4) {
   void * jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::PropertyNotification *arg2 = 0 ;
-  Dali::PropertyNotification *result = 0 ;
+  std::type_info *arg1 = 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
+  bool arg4 ;
+  Dali::TypeRegistration *result = 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
-  arg2 = (Dali::PropertyNotification *)jarg2;
+  arg1 = (std::type_info *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
+    return 0;
+  }
+  arg2 = (std::type_info *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
     return 0;
   }
+  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
+  arg4 = jarg4 ? true : false;
   {
     try {
-      result = (Dali::PropertyNotification *) &(arg1)->operator =((Dali::PropertyNotification const &)*arg2);
+      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::type_info const &)*arg1,(std::type_info const &)*arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -8785,157 +8559,214 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_Assign(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetCondition__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_2(char * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::PropertyCondition result;
+  std::string *arg1 = 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
+  Dali::TypeRegistration *result = 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  arg2 = (std::type_info *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
+    return 0;
+  }
+  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
   {
     try {
-      result = (arg1)->GetCondition();
+      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::string const &)*arg1,(std::type_info const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyCondition((const Dali::PropertyCondition &)result);
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTarget(void * jarg1) {
-  void * jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::Handle result;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisteredName(void * jarg1) {
+  char * jresult ;
+  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
+  std::string result;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
   {
     try {
-      result = ((Dali::PropertyNotification const *)arg1)->GetTarget();
+      result = ((Dali::TypeRegistration const *)arg1)->RegisteredName();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Handle((const Dali::Handle &)result);
+  jresult = SWIG_csharp_string_callback((&result)->c_str());
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTargetProperty(void * jarg1) {
-  int jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::Property::Index result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterControl(char * jarg1, void * jarg2) {
+  std::string *arg1 = 0 ;
+  Dali::CSharpTypeInfo::CreateFunction arg2 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  arg2 = (Dali::CSharpTypeInfo::CreateFunction)jarg2;
   {
     try {
-      result = (Dali::Property::Index)((Dali::PropertyNotification const *)arg1)->GetTargetProperty();
-    } CALL_CATCH_EXCEPTION(0);
+      Dali_TypeRegistration_RegisterControl((std::string const &)*arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
+
+  //argout typemap for const std::string&
+
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotification_SetNotifyMode(void * jarg1, int jarg2) {
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::PropertyNotification::NotifyMode arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
+  std::string *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  int arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
+  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
-  arg2 = (Dali::PropertyNotification::NotifyMode)jarg2;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (int)jarg3;
+  arg4 = (Dali::Property::Type)jarg4;
+  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5;
+  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6;
   {
     try {
-      (arg1)->SetNotifyMode(arg2);
+      Dali_TypeRegistration_RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
     } CALL_CATCH_EXCEPTION();
   }
 
+
+  //argout typemap for const std::string&
+
+
+  //argout typemap for const std::string&
+
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyMode(void * jarg1) {
-  int jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::PropertyNotification::NotifyMode result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistration(void * jarg1) {
+  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
   {
     try {
-      result = (Dali::PropertyNotification::NotifyMode)(arg1)->GetNotifyMode();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyResult(void * jarg1) {
-  bool jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_SignalConnectorType(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::TypeInfo::SignalConnectorFunction arg3 = (Dali::TypeInfo::SignalConnectorFunction) 0 ;
+  Dali::SignalConnectorType *result = 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::TypeInfo::SignalConnectorFunction)jarg3;
   {
     try {
-      result = (bool)((Dali::PropertyNotification const *)arg1)->GetNotifyResult();
+      result = (Dali::SignalConnectorType *)new Dali::SignalConnectorType(*arg1,(std::string const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_NotifySignal(void * jarg1) {
-  void * jresult ;
-  Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
-  Dali::PropertyNotifySignalType *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalConnectorType(void * jarg1) {
+  Dali::SignalConnectorType *arg1 = (Dali::SignalConnectorType *) 0 ;
 
-  arg1 = (Dali::PropertyNotification *)jarg1;
+  arg1 = (Dali::SignalConnectorType *)jarg1;
   {
     try {
-      result = (Dali::PropertyNotifySignalType *) &(arg1)->NotifySignal();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Handle__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeAction(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
-  Dali::Handle *result = 0 ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::TypeInfo::ActionFunction arg3 = (Dali::TypeInfo::ActionFunction) 0 ;
+  Dali::TypeAction *result = 0 ;
 
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::TypeInfo::ActionFunction)jarg3;
   {
     try {
-      result = (Dali::Handle *)new Dali::Handle();
+      result = (Dali::TypeAction *)new Dali::TypeAction(*arg1,(std::string const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_New() {
-  void * jresult ;
-  Dali::Handle result;
 
-  {
-    try {
-      result = Dali::Handle::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  //argout typemap for const std::string&
 
-  jresult = new Dali::Handle((const Dali::Handle &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Handle(void * jarg1) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeAction(void * jarg1) {
+  Dali::TypeAction *arg1 = (Dali::TypeAction *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
+  arg1 = (Dali::TypeAction *)jarg1;
   {
     try {
       delete arg1;
@@ -8945,148 +8776,175 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Handle(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Handle__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
   void * jresult ;
-  Dali::Handle *arg1 = 0 ;
-  Dali::Handle *result = 0 ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::TypeInfo::SetPropertyFunction arg5 = (Dali::TypeInfo::SetPropertyFunction) 0 ;
+  Dali::TypeInfo::GetPropertyFunction arg6 = (Dali::TypeInfo::GetPropertyFunction) 0 ;
+  Dali::PropertyRegistration *result = 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Type)jarg4;
+  arg5 = (Dali::TypeInfo::SetPropertyFunction)jarg5;
+  arg6 = (Dali::TypeInfo::GetPropertyFunction)jarg6;
   {
     try {
-      result = (Dali::Handle *)new Dali::Handle((Dali::Handle const &)*arg1);
+      result = (Dali::PropertyRegistration *)new Dali::PropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
     } CALL_CATCH_EXCEPTION(0);
   }
 
   jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Handle *arg2 = 0 ;
-  Dali::Handle *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyRegistration(void * jarg1) {
+  Dali::PropertyRegistration *arg1 = (Dali::PropertyRegistration *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Handle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PropertyRegistration *)jarg1;
   {
     try {
-      result = (Dali::Handle *) &(arg1)->operator =((Dali::Handle const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_0(void * jarg1, char * jarg2, int jarg3, int jarg4) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Handle result;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::AnimatablePropertyRegistration *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Type)jarg4;
   {
     try {
-      result = Dali::Handle::DownCast(arg1);
+      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Handle((const Dali::Handle &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_Supports(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Handle::Capability arg2 ;
-  bool result;
+  jresult = (void *)result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Handle::Capability)jarg2;
-  {
-    try {
-      result = (bool)((Dali::Handle const *)arg1)->Supports(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  //argout typemap for const std::string&
 
-  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyCount(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_1(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Value *arg4 = 0 ;
+  Dali::AnimatablePropertyRegistration *result = 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  }
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Value *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (unsigned int)((Dali::Handle const *)arg1)->GetPropertyCount();
+      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,(Dali::Property::Value const &)*arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Handle_GetPropertyName(void * jarg1, int jarg2) {
-  char * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  std::string result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyRegistration(void * jarg1) {
+  Dali::AnimatablePropertyRegistration *arg1 = (Dali::AnimatablePropertyRegistration *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (Dali::AnimatablePropertyRegistration *)jarg1;
   {
     try {
-      result = ((Dali::Handle const *)arg1)->GetPropertyName(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndex(void * jarg1, char * jarg2) {
-  int jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyComponentRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property::Index result;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Index arg4 ;
+  unsigned int arg5 ;
+  Dali::AnimatablePropertyComponentRegistration *result = 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  }
   if (!jarg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
   std::string arg2_str(jarg2);
   arg2 = &arg2_str;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Index)jarg4;
+  arg5 = (unsigned int)jarg5;
   {
     try {
-      result = (Dali::Property::Index)((Dali::Handle const *)arg1)->GetPropertyIndex((std::string const &)*arg2);
+      result = (Dali::AnimatablePropertyComponentRegistration *)new Dali::AnimatablePropertyComponentRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
 
   //argout typemap for const std::string&
 
@@ -9094,125 +8952,89 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndex(void * jarg1, cha
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_IsPropertyWritable(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyComponentRegistration(void * jarg1) {
+  Dali::AnimatablePropertyComponentRegistration *arg1 = (Dali::AnimatablePropertyComponentRegistration *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (Dali::AnimatablePropertyComponentRegistration *)jarg1;
   {
     try {
-      result = (bool)((Dali::Handle const *)arg1)->IsPropertyWritable(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_IsPropertyAnimatable(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ChildPropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::ChildPropertyRegistration *result = 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  {
-    try {
-      result = (bool)((Dali::Handle const *)arg1)->IsPropertyAnimatable(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
   }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Handle_IsPropertyAConstraintInput(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  bool result;
-
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Type)jarg4;
   {
     try {
-      result = (bool)((Dali::Handle const *)arg1)->IsPropertyAConstraintInput(arg2);
+      result = (Dali::ChildPropertyRegistration *)new Dali::ChildPropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyType(void * jarg1, int jarg2) {
-  int jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Type result;
+  jresult = (void *)result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  {
-    try {
-      result = (Dali::Property::Type)((Dali::Handle const *)arg1)->GetPropertyType(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  //argout typemap for const std::string&
 
-  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_SetProperty(void * jarg1, int jarg2, void * jarg3) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ChildPropertyRegistration(void * jarg1) {
+  Dali::ChildPropertyRegistration *arg1 = (Dali::ChildPropertyRegistration *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::ChildPropertyRegistration *)jarg1;
   {
     try {
-      (arg1)->SetProperty(arg2,(Dali::Property::Value const &)*arg3);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Value *arg3 = 0 ;
-  Dali::Property::Index result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterType(char * jarg1, void * jarg2, void * jarg3) {
+  bool jresult ;
+  std::string *arg1 = 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::CSharpTypeInfo::CreateFunction arg3 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  if (!jarg2) {
+  if (!jarg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  arg2 = (std::type_info *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
     return 0;
   }
+  arg3 = (Dali::CSharpTypeInfo::CreateFunction)jarg3;
   {
     try {
-      result = (Dali::Property::Index)(arg1)->RegisterProperty((std::string const &)*arg2,(Dali::Property::Value const &)*arg3);
+      result = (bool)Dali::CSharpTypeRegistry::RegisterType((std::string const &)*arg1,(std::type_info const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -9224,30 +9046,35 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_1(void * jarg1, char * jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
+  bool jresult ;
+  std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property::Value *arg3 = 0 ;
-  Dali::Property::AccessMode arg4 ;
-  Dali::Property::Index result;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
+  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
   if (!jarg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
   std::string arg2_str(jarg2);
   arg2 = &arg2_str;
-  arg3 = (Dali::Property::Value *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
-  }
-  arg4 = (Dali::Property::AccessMode)jarg4;
+  arg3 = (Dali::Property::Index)jarg3;
+  arg4 = (Dali::Property::Type)jarg4;
+  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5;
+  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6;
   {
     try {
-      result = (Dali::Property::Index)(arg1)->RegisterProperty((std::string const &)*arg2,(Dali::Property::Value const &)*arg3,arg4);
+      result = (bool)Dali::CSharpTypeRegistry::RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -9255,480 +9082,391 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_1(void * ja
 
   //argout typemap for const std::string&
 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_GetProperty(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  {
-    try {
-      result = ((Dali::Handle const *)arg1)->GetProperty(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  //argout typemap for const std::string&
 
-  jresult = new Dali::Property::Value((const Dali::Property::Value &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_GetCurrentProperty(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Count(void * jarg1) {
+  unsigned long jresult ;
+  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
+  Dali::VectorBase::SizeType result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
+  arg1 = (Dali::VectorBase *)jarg1;
   {
     try {
-      result = ((Dali::Handle const *)arg1)->GetCurrentProperty(arg2);
+      result = ((Dali::VectorBase const *)arg1)->Count();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Property::Value((const Dali::Property::Value &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndices(void * jarg1, void * jarg2) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::IndexContainer *arg2 = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Size(void * jarg1) {
+  unsigned long jresult ;
+  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
+  Dali::VectorBase::SizeType result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::IndexContainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::IndexContainer & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::VectorBase *)jarg1;
   {
     try {
-      ((Dali::Handle const *)arg1)->GetPropertyIndices(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::VectorBase const *)arg1)->Size();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (unsigned long)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_0(void * jarg1, int jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::PropertyCondition *arg3 = 0 ;
-  Dali::PropertyNotification result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_VectorBase_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (Dali::PropertyCondition *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::VectorBase *)jarg1;
   {
     try {
-      result = (arg1)->AddPropertyNotification(arg2,(Dali::PropertyCondition const &)*arg3);
+      result = (bool)((Dali::VectorBase const *)arg1)->Empty();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyNotification((const Dali::PropertyNotification &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_1(void * jarg1, int jarg2, int jarg3, void * jarg4) {
-  void * jresult ;
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::Property::Index arg2 ;
-  int arg3 ;
-  Dali::PropertyCondition *arg4 = 0 ;
-  Dali::PropertyNotification result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Capacity(void * jarg1) {
+  unsigned long jresult ;
+  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
+  Dali::VectorBase::SizeType result;
 
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  arg3 = (int)jarg3;
-  arg4 = (Dali::PropertyCondition *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyCondition const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::VectorBase *)jarg1;
   {
     try {
-      result = (arg1)->AddPropertyNotification(arg2,arg3,(Dali::PropertyCondition const &)*arg4);
+      result = ((Dali::VectorBase const *)arg1)->Capacity();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::PropertyNotification((const Dali::PropertyNotification &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotification(void * jarg1, void * jarg2) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  Dali::PropertyNotification arg2 ;
-  Dali::PropertyNotification *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorBase_Release(void * jarg1) {
+  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
 
-  arg1 = (Dali::Handle *)jarg1;
-  argp2 = (Dali::PropertyNotification *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PropertyNotification", 0);
-    return ;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::VectorBase *)jarg1;
   {
     try {
-      (arg1)->RemovePropertyNotification(arg2);
+      (arg1)->Release();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotifications(void * jarg1) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-
-  arg1 = (Dali::Handle *)jarg1;
-  {
-    try {
-      (arg1)->RemovePropertyNotifications();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_0(void * jarg1) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-
-  arg1 = (Dali::Handle *)jarg1;
-  {
-    try {
-      (arg1)->RemoveConstraints();
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FIRST_VALID_PIXEL_FORMAT_get() {
+  int jresult ;
+  Dali::Pixel::Format result;
 
+  result = (Dali::Pixel::Format)(Dali::Pixel::Format)Dali::Pixel::FIRST_VALID_PIXEL_FORMAT;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_1(void * jarg1, unsigned int jarg2) {
-  Dali::Handle *arg1 = (Dali::Handle *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (Dali::Handle *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      (arg1)->RemoveConstraints(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LAST_VALID_PIXEL_FORMAT_get() {
+  int jresult ;
+  Dali::Pixel::Format result;
 
+  result = (Dali::Pixel::Format)(Dali::Pixel::Format)Dali::Pixel::LAST_VALID_PIXEL_FORMAT;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_New() {
-  void * jresult ;
-  Dali::Handle result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_HasAlpha(int jarg1) {
+  bool jresult ;
+  Dali::Pixel::Format arg1 ;
+  bool result;
 
+  arg1 = (Dali::Pixel::Format)jarg1;
   {
     try {
-      result = Dali::WeightObject::New();
+      result = (bool)Dali::Pixel::HasAlpha(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Handle((const Dali::Handle &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_0() {
-  void * jresult ;
-  Dali::TypeInfo *result = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GetBytesPerPixel(int jarg1) {
+  unsigned int jresult ;
+  Dali::Pixel::Format arg1 ;
+  unsigned int result;
 
+  arg1 = (Dali::Pixel::Format)jarg1;
   {
     try {
-      result = (Dali::TypeInfo *)new Dali::TypeInfo();
+      result = (unsigned int)Dali::Pixel::GetBytesPerPixel(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeInfo(void * jarg1) {
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GetAlphaOffsetAndMask(int jarg1, void * jarg2, void * jarg3) {
+  Dali::Pixel::Format arg1 ;
+  int *arg2 = 0 ;
+  int *arg3 = 0 ;
 
-  arg1 = (Dali::TypeInfo *)jarg1;
+  arg1 = (Dali::Pixel::Format)jarg1;
+  arg2 = (int *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "int & type is null", 0);
+    return ;
+  }
+  arg3 = (int *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "int & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      Dali::Pixel::GetAlphaOffsetAndMask(arg1,*arg2,*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelData_New(unsigned char* nuiBuffer, unsigned int nuiBufferSize, unsigned int nuiWidth, unsigned int nuiHeight, int nuiPixelFormat) {
   void * jresult ;
-  Dali::TypeInfo *arg1 = 0 ;
-  Dali::TypeInfo *result = 0 ;
+  Dali::PixelData result;
 
-  arg1 = (Dali::TypeInfo *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo const & type is null", 0);
-    return 0;
-  }
   {
-    try {
-      result = (Dali::TypeInfo *)new Dali::TypeInfo((Dali::TypeInfo const &)*arg1);
+    unsigned char* copiedBuffer;
+    try
+    {
+      copiedBuffer = new unsigned char[nuiBufferSize];
     } CALL_CATCH_EXCEPTION(0);
+
+    try
+    {
+      // Note : copiedBuffer created by 'new' method. So ReleaseFunction always be DELETE_ARRAY.
+      memcpy(copiedBuffer, nuiBuffer, nuiBufferSize);
+      result = Dali::PixelData::New(copiedBuffer, nuiBufferSize, nuiWidth, nuiHeight, (Dali::Pixel::Format)nuiPixelFormat, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
+    } CALL_CATCH_EXCEPTION_WITH_FUNCTION(0, [](unsigned char* buffer){delete[] buffer;}, copiedBuffer);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PixelData((const Dali::PixelData &)result);
+
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PixelData(void * nuiHandle) {
+  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeInfo_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  Dali::TypeInfo *arg2 = 0 ;
-  Dali::TypeInfo *result = 0 ;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  arg2 = (Dali::TypeInfo *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeInfo const & type is null", 0);
-    return 0;
-  }
+  pixelData = (Dali::PixelData *)nuiHandle;
   {
     try {
-      result = (Dali::TypeInfo *) &(arg1)->operator =((Dali::TypeInfo const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete pixelData;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetName(void * jarg1) {
-  char * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  std::string *result = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetWidth(void * nuiHandle) {
+  unsigned int jresult ;
+  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::TypeInfo *)jarg1;
+  pixelData = (Dali::PixelData *)nuiHandle;
   {
     try {
-      result = (std::string *) &((Dali::TypeInfo const *)arg1)->GetName();
+      result = (unsigned int)((Dali::PixelData const *)pixelData)->GetWidth();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback(result->c_str());
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetBaseName(void * jarg1) {
-  char * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  std::string *result = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetHeight(void * nuiHandle) {
+  unsigned int jresult ;
+  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::TypeInfo *)jarg1;
+  pixelData = (Dali::PixelData *)nuiHandle;
   {
     try {
-      result = (std::string *) &((Dali::TypeInfo const *)arg1)->GetBaseName();
+      result = (unsigned int)((Dali::PixelData const *)pixelData)->GetHeight();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback(result->c_str());
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeInfo_CreateInstance(void * jarg1) {
-  void * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  Dali::BaseHandle result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PixelData_GetPixelFormat(void * nuiHandle) {
+  int jresult ;
+  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
+  Dali::Pixel::Format result;
 
-  arg1 = (Dali::TypeInfo *)jarg1;
+  pixelData = (Dali::PixelData *)nuiHandle;
   {
     try {
-      result = ((Dali::TypeInfo const *)arg1)->CreateInstance();
+      result = (Dali::Pixel::Format)((Dali::PixelData const *)pixelData)->GetPixelFormat();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::BaseHandle((const Dali::BaseHandle &)result);
+  jresult = (int)result;
   return jresult;
 }
 
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PixelData_GenerateUrl(void* nuiHandle)
+{
+  Dali::PixelData *pixelData = (Dali::PixelData*)nuiHandle;
+  Dali::Toolkit::ImageUrl result;
+  void *jresult;
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetActionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
+  if (!pixelData)
   {
-    try {
-      result = ((Dali::TypeInfo const *)arg1)->GetActionCount();
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "some argument is null", 0);
+    return 0;
+  }
+  {
+    try
+    {
+      result = Dali::Toolkit::Image::GenerateUrl(*pixelData);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl&)result);
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetActionName(void * jarg1, unsigned long jarg2) {
-  char * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  size_t arg2 ;
-  std::string result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = (arg1)->GetActionName(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_X_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_X;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetSignalCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  {
-    try {
-      result = ((Dali::TypeInfo const *)arg1)->GetSignalCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_X_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
-  jresult = (unsigned long)result;
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_X;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetSignalName(void * jarg1, unsigned long jarg2) {
-  char * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  size_t arg2 ;
-  std::string result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = (arg1)->GetSignalName(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Y_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_Y;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  {
-    try {
-      result = ((Dali::TypeInfo const *)arg1)->GetPropertyCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Y_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
-  jresult = (unsigned long)result;
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_Y;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyIndices(void * jarg1, void * jarg2) {
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  Dali::Property::IndexContainer *arg2 = 0 ;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  arg2 = (Dali::Property::IndexContainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::IndexContainer & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      ((Dali::TypeInfo const *)arg1)->GetPropertyIndices(*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Z_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_Z;
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyName(void * jarg1, int jarg2) {
-  char * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  Dali::Property::Index arg2 ;
-  std::string_view result;
-
-  arg1 = (Dali::TypeInfo *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  {
-    try {
-      result = ((Dali::TypeInfo const *)arg1)->GetPropertyName(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Z_get() {
+  unsigned int jresult ;
+  unsigned int result;
 
-  jresult = SWIG_csharp_string_callback(result.data());
+  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_Z;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_0(int jarg1, int jarg2, unsigned int jarg3, unsigned int jarg4) {
   void * jresult ;
-  Dali::TypeRegistry result;
+  Dali::TextureType::Type arg1 ;
+  Dali::Pixel::Format arg2 ;
+  unsigned int arg3 ;
+  unsigned int arg4 ;
+  Dali::Texture result;
 
+  arg1 = (Dali::TextureType::Type)jarg1;
+  arg2 = (Dali::Pixel::Format)jarg2;
+  arg3 = (unsigned int)jarg3;
+  arg4 = (unsigned int)jarg4;
   {
     try {
-      result = Dali::TypeRegistry::Get();
+      result = Dali::Texture::New(arg1,arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TypeRegistry((const Dali::TypeRegistry &)result);
+  jresult = new Dali::Texture((const Dali::Texture &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::TypeRegistry *result = 0 ;
+  NativeImageInterface *arg1 = 0 ;
+  Dali::Texture result;
 
+  arg1 = (NativeImageInterface *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "NativeImageInterface & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::TypeRegistry *)new Dali::TypeRegistry();
+      result = Dali::Texture::New(*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Texture((const Dali::Texture &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistry(void * jarg1) {
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Texture(void * jarg1) {
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
+  arg1 = (Dali::Texture *)jarg1;
   {
     try {
       delete arg1;
@@ -9738,404 +9476,350 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistry(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::TypeRegistry *arg1 = 0 ;
-  Dali::TypeRegistry *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_0(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+  Dali::PixelData arg2 ;
+  Dali::PixelData *argp2 ;
+  bool result;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistry const & type is null", 0);
+  arg1 = (Dali::Texture *)jarg1;
+  argp2 = (Dali::PixelData *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PixelData", 0);
     return 0;
   }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::TypeRegistry *)new Dali::TypeRegistry((Dali::TypeRegistry const &)*arg1);
+      result = (bool)(arg1)->Upload(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
-  Dali::TypeRegistry *arg2 = 0 ;
-  Dali::TypeRegistry *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, unsigned int jarg7, unsigned int jarg8) {
+  bool jresult ;
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+  Dali::PixelData arg2 ;
+  unsigned int arg3 ;
+  unsigned int arg4 ;
+  unsigned int arg5 ;
+  unsigned int arg6 ;
+  unsigned int arg7 ;
+  unsigned int arg8 ;
+  Dali::PixelData *argp2 ;
+  bool result;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
-  arg2 = (Dali::TypeRegistry *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistry const & type is null", 0);
+  arg1 = (Dali::Texture *)jarg1;
+  argp2 = (Dali::PixelData *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PixelData", 0);
     return 0;
   }
+  arg2 = *argp2;
+  arg3 = (unsigned int)jarg3;
+  arg4 = (unsigned int)jarg4;
+  arg5 = (unsigned int)jarg5;
+  arg6 = (unsigned int)jarg6;
+  arg7 = (unsigned int)jarg7;
+  arg8 = (unsigned int)jarg8;
   {
     try {
-      result = (Dali::TypeRegistry *) &(arg1)->operator =((Dali::TypeRegistry const &)*arg2);
+      result = (bool)(arg1)->Upload(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_0(void * jarg1, char * jarg2) {
-  void * jresult ;
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::TypeInfo result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Texture_GenerateMipmaps(void * jarg1) {
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
+  arg1 = (Dali::Texture *)jarg1;
   {
     try {
-      result = (arg1)->GetTypeInfo((std::string const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->GenerateMipmaps();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::TypeInfo((const Dali::TypeInfo &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
-  std::type_info *arg2 = 0 ;
-  Dali::TypeInfo result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetWidth(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
-  arg2 = (std::type_info *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Texture *)jarg1;
   {
     try {
-      result = (arg1)->GetTypeInfo((std::type_info const &)*arg2);
+      result = (unsigned int)((Dali::Texture const *)arg1)->GetWidth();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TypeInfo((const Dali::TypeInfo &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeNameCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
-  size_t result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetHeight(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
+  arg1 = (Dali::Texture *)jarg1;
   {
     try {
-      result = ((Dali::TypeRegistry const *)arg1)->GetTypeNameCount();
+      result = (unsigned int)((Dali::Texture const *)arg1)->GetHeight();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeName(void * jarg1, unsigned long jarg2) {
-  char * jresult ;
-  Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
-  size_t arg2 ;
-  std::string result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_New() {
+  void * jresult ;
+  Dali::Sampler result;
 
-  arg1 = (Dali::TypeRegistry *)jarg1;
-  arg2 = (size_t)jarg2;
   {
     try {
-      result = ((Dali::TypeRegistry const *)arg1)->GetTypeName(arg2);
+      result = Dali::Sampler::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
+  jresult = new Dali::Sampler((const Dali::Sampler &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  std::type_info *arg1 = 0 ;
-  std::type_info *arg2 = 0 ;
-  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
-  Dali::TypeRegistration *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Sampler(void * jarg1) {
+  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
 
-  arg1 = (std::type_info *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg2 = (std::type_info *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
+  arg1 = (Dali::Sampler *)jarg1;
   {
     try {
-      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::type_info const &)*arg1,(std::type_info const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_1(void * jarg1, void * jarg2, void * jarg3, bool jarg4) {
-  void * jresult ;
-  std::type_info *arg1 = 0 ;
-  std::type_info *arg2 = 0 ;
-  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
-  bool arg4 ;
-  Dali::TypeRegistration *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetFilterMode(void * jarg1, int jarg2, int jarg3) {
+  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
+  Dali::FilterMode::Type arg2 ;
+  Dali::FilterMode::Type arg3 ;
 
-  arg1 = (std::type_info *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg2 = (std::type_info *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
-  arg4 = jarg4 ? true : false;
+  arg1 = (Dali::Sampler *)jarg1;
+  arg2 = (Dali::FilterMode::Type)jarg2;
+  arg3 = (Dali::FilterMode::Type)jarg3;
   {
     try {
-      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::type_info const &)*arg1,(std::type_info const &)*arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetFilterMode(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_2(char * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  std::type_info *arg2 = 0 ;
-  Dali::TypeInfo::CreateFunction arg3 = (Dali::TypeInfo::CreateFunction) 0 ;
-  Dali::TypeRegistration *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_0(void * jarg1, int jarg2, int jarg3) {
+  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
+  Dali::WrapMode::Type arg2 ;
+  Dali::WrapMode::Type arg3 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  arg2 = (std::type_info *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg3 = (Dali::TypeInfo::CreateFunction)jarg3;
+  arg1 = (Dali::Sampler *)jarg1;
+  arg2 = (Dali::WrapMode::Type)jarg2;
+  arg3 = (Dali::WrapMode::Type)jarg3;
   {
     try {
-      result = (Dali::TypeRegistration *)new Dali::TypeRegistration((std::string const &)*arg1,(std::type_info const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetWrapMode(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
+}
 
-  //argout typemap for const std::string&
 
-  return jresult;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_1(void * jarg1, int jarg2, int jarg3, int jarg4) {
+  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
+  Dali::WrapMode::Type arg2 ;
+  Dali::WrapMode::Type arg3 ;
+  Dali::WrapMode::Type arg4 ;
+
+  arg1 = (Dali::Sampler *)jarg1;
+  arg2 = (Dali::WrapMode::Type)jarg2;
+  arg3 = (Dali::WrapMode::Type)jarg3;
+  arg4 = (Dali::WrapMode::Type)jarg4;
+  {
+    try {
+      (arg1)->SetWrapMode(arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisteredName(void * jarg1) {
-  char * jresult ;
-  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
-  std::string result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_New() {
+  void * jresult ;
+  Dali::TextureSet result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
   {
     try {
-      result = ((Dali::TypeRegistration const *)arg1)->RegisteredName();
+      result = Dali::TextureSet::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
+  jresult = new Dali::TextureSet((const Dali::TextureSet &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterControl(char * jarg1, void * jarg2) {
-  std::string *arg1 = 0 ;
-  Dali::CSharpTypeInfo::CreateFunction arg2 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextureSet(void * jarg1) {
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  arg2 = (Dali::CSharpTypeInfo::CreateFunction)jarg2;
+  arg1 = (Dali::TextureSet *)jarg1;
   {
     try {
-      Dali_TypeRegistration_RegisterControl((std::string const &)*arg1,arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
-
-  //argout typemap for const std::string&
-
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
-  std::string *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  int arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
-  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetTexture(void * jarg1, unsigned long jarg2, void * jarg3) {
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
+  size_t arg2 ;
+  Dali::Texture arg3 ;
+  Dali::Texture *argp3 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::TextureSet *)jarg1;
+  arg2 = (size_t)jarg2;
+  argp3 = (Dali::Texture *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
     return ;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (int)jarg3;
-  arg4 = (Dali::Property::Type)jarg4;
-  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5;
-  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6;
+  arg3 = *argp3;
   {
     try {
-      Dali_TypeRegistration_RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+      (arg1)->SetTexture(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
+}
 
-  //argout typemap for const std::string&
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetTexture(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
+  size_t arg2 ;
+  Dali::Texture result;
 
-  //argout typemap for const std::string&
+  arg1 = (Dali::TextureSet *)jarg1;
+  arg2 = (size_t)jarg2;
+  {
+    try {
+      result = ((Dali::TextureSet const *)arg1)->GetTexture(arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
+  jresult = new Dali::Texture((const Dali::Texture &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistration(void * jarg1) {
-  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetSampler(void * jarg1, unsigned long jarg2, void * jarg3) {
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
+  size_t arg2 ;
+  Dali::Sampler arg3 ;
+  Dali::Sampler *argp3 ;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
+  arg1 = (Dali::TextureSet *)jarg1;
+  arg2 = (size_t)jarg2;
+  argp3 = (Dali::Sampler *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Sampler", 0);
+    return ;
+  }
+  arg3 = *argp3;
   {
     try {
-      delete arg1;
+      (arg1)->SetSampler(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_SignalConnectorType(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetSampler(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::TypeInfo::SignalConnectorFunction arg3 = (Dali::TypeInfo::SignalConnectorFunction) 0 ;
-  Dali::SignalConnectorType *result = 0 ;
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
+  size_t arg2 ;
+  Dali::Sampler result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::TypeInfo::SignalConnectorFunction)jarg3;
+  arg1 = (Dali::TextureSet *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      result = (Dali::SignalConnectorType *)new Dali::SignalConnectorType(*arg1,(std::string const &)*arg2,arg3);
+      result = ((Dali::TextureSet const *)arg1)->GetSampler(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = new Dali::Sampler((const Dali::Sampler &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalConnectorType(void * jarg1) {
-  Dali::SignalConnectorType *arg1 = (Dali::SignalConnectorType *) 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextureSet_GetTextureCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
+  size_t result;
 
-  arg1 = (Dali::SignalConnectorType *)jarg1;
+  arg1 = (Dali::TextureSet *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::TextureSet const *)arg1)->GetTextureCount();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (unsigned long)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeAction(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VertexBuffer_New(void * jarg1) {
   void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::TypeInfo::ActionFunction arg3 = (Dali::TypeInfo::ActionFunction) 0 ;
-  Dali::TypeAction *result = 0 ;
+  Dali::Property::Map *arg1 = 0 ;
+  Dali::VertexBuffer result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
+  arg1 = (Dali::Property::Map *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::TypeInfo::ActionFunction)jarg3;
   {
     try {
-      result = (Dali::TypeAction *)new Dali::TypeAction(*arg1,(std::string const &)*arg2,arg3);
+      result = Dali::VertexBuffer::New(*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = new Dali::VertexBuffer((const Dali::VertexBuffer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeAction(void * jarg1) {
-  Dali::TypeAction *arg1 = (Dali::TypeAction *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VertexBuffer(void * jarg1) {
+  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
 
-  arg1 = (Dali::TypeAction *)jarg1;
+  arg1 = (Dali::VertexBuffer *)jarg1;
   {
     try {
       delete arg1;
@@ -10145,49 +9829,59 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeAction(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::TypeInfo::SetPropertyFunction arg5 = (Dali::TypeInfo::SetPropertyFunction) 0 ;
-  Dali::TypeInfo::GetPropertyFunction arg6 = (Dali::TypeInfo::GetPropertyFunction) 0 ;
-  Dali::PropertyRegistration *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VertexBuffer_SetData(void * jarg1, void * jarg2, unsigned long jarg3) {
+  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
+  void *arg2 = (void *) 0 ;
+  std::size_t arg3 ;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Type)jarg4;
-  arg5 = (Dali::TypeInfo::SetPropertyFunction)jarg5;
-  arg6 = (Dali::TypeInfo::GetPropertyFunction)jarg6;
+  arg1 = (Dali::VertexBuffer *)jarg1;
+  arg2 = jarg2;
+  arg3 = (std::size_t)jarg3;
   {
     try {
-      result = (Dali::PropertyRegistration *)new Dali::PropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+      (arg1)->SetData((void const *)arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VertexBuffer_GetSize(void * jarg1) {
+  unsigned long jresult ;
+  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
+  std::size_t result;
+
+  arg1 = (Dali::VertexBuffer *)jarg1;
+  {
+    try {
+      result = ((Dali::VertexBuffer const *)arg1)->GetSize();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
+  return jresult;
+}
 
-  //argout typemap for const std::string&
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_New() {
+  void * jresult ;
+  Dali::Geometry result;
+
+  {
+    try {
+      result = Dali::Geometry::New();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Geometry((const Dali::Geometry &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyRegistration(void * jarg1) {
-  Dali::PropertyRegistration *arg1 = (Dali::PropertyRegistration *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Geometry(void * jarg1) {
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
 
-  arg1 = (Dali::PropertyRegistration *)jarg1;
+  arg1 = (Dali::Geometry *)jarg1;
   {
     try {
       delete arg1;
@@ -10197,197 +9891,128 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyRegistration(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_0(void * jarg1, char * jarg2, int jarg3, int jarg4) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::AnimatablePropertyRegistration *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_AddVertexBuffer(void * jarg1, void * jarg2) {
+  unsigned long jresult ;
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  Dali::VertexBuffer *arg2 = 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+  arg1 = (Dali::Geometry *)jarg1;
+  arg2 = (Dali::VertexBuffer *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::VertexBuffer & type is null", 0);
     return 0;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Type)jarg4;
   {
     try {
-      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
+      result = (arg1)->AddVertexBuffer(*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_1(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Value *arg4 = 0 ;
-  Dali::AnimatablePropertyRegistration *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_GetNumberOfVertexBuffers(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Value *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Value const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Geometry *)jarg1;
   {
     try {
-      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,(Dali::Property::Value const &)*arg4);
+      result = ((Dali::Geometry const *)arg1)->GetNumberOfVertexBuffers();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyRegistration(void * jarg1) {
-  Dali::AnimatablePropertyRegistration *arg1 = (Dali::AnimatablePropertyRegistration *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_RemoveVertexBuffer(void * jarg1, unsigned long jarg2) {
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  std::size_t arg2 ;
 
-  arg1 = (Dali::AnimatablePropertyRegistration *)jarg1;
+  arg1 = (Dali::Geometry *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->RemoveVertexBuffer(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyComponentRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Index arg4 ;
-  unsigned int arg5 ;
-  Dali::AnimatablePropertyComponentRegistration *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetIndexBuffer(void * jarg1, unsigned short* jarg2, unsigned long jarg3) {
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  unsigned short *arg2 = (unsigned short *) 0 ;
+  size_t arg3 ;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Index)jarg4;
-  arg5 = (unsigned int)jarg5;
+  arg1 = (Dali::Geometry *)jarg1;
+  arg2 = jarg2;
+  arg3 = (size_t)jarg3;
   {
     try {
-      result = (Dali::AnimatablePropertyComponentRegistration *)new Dali::AnimatablePropertyComponentRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetIndexBuffer((unsigned short const *)arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
 
-  //argout typemap for const std::string&
 
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyComponentRegistration(void * jarg1) {
-  Dali::AnimatablePropertyComponentRegistration *arg1 = (Dali::AnimatablePropertyComponentRegistration *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetType(void * jarg1, int jarg2) {
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  Dali::Geometry::Type arg2 ;
 
-  arg1 = (Dali::AnimatablePropertyComponentRegistration *)jarg1;
+  arg1 = (Dali::Geometry *)jarg1;
+  arg2 = (Dali::Geometry::Type)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->SetType(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ChildPropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::ChildPropertyRegistration *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Geometry_GetType(void * jarg1) {
+  int jresult ;
+  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+  Dali::Geometry::Type result;
 
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  }
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Type)jarg4;
+  arg1 = (Dali::Geometry *)jarg1;
   {
     try {
-      result = (Dali::ChildPropertyRegistration *)new Dali::ChildPropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
+      result = (Dali::Geometry::Type)((Dali::Geometry const *)arg1)->GetType();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-  //argout typemap for const std::string&
-
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ChildPropertyRegistration(void * jarg1) {
-  Dali::ChildPropertyRegistration *arg1 = (Dali::ChildPropertyRegistration *) 0 ;
-
-  arg1 = (Dali::ChildPropertyRegistration *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Shader_Property_PROGRAM_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::Shader::Property::PROGRAM;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterType(char * jarg1, void * jarg2, void * jarg3) {
-  bool jresult ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_0(char * jarg1, char * jarg2, int jarg3) {
+  void * jresult ;
   std::string *arg1 = 0 ;
-  std::type_info *arg2 = 0 ;
-  Dali::CSharpTypeInfo::CreateFunction arg3 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
-  bool result;
+  std::string *arg2 = 0 ;
+  Dali::Shader::Hint::Value arg3 ;
+  Dali::Shader result;
 
   if (!jarg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
@@ -10395,19 +10020,23 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterType(char * jarg1, void * jarg2,
   }
   std::string arg1_str(jarg1);
   arg1 = &arg1_str;
-  arg2 = (std::type_info *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
-  arg3 = (Dali::CSharpTypeInfo::CreateFunction)jarg3;
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (Dali::Shader::Hint::Value)jarg3;
   {
     try {
-      result = (bool)Dali::CSharpTypeRegistry::RegisterType((std::string const &)*arg1,(std::type_info const &)*arg2,arg3);
+      result = Dali::Shader::New((std::string const &)*arg1,(std::string const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Shader((const Dali::Shader &)result);
+
+  //argout typemap for const std::string&
+
 
   //argout typemap for const std::string&
 
@@ -10415,15 +10044,11 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterType(char * jarg1, void * jarg2,
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
-  bool jresult ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_1(char * jarg1, char * jarg2) {
+  void * jresult ;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
-  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
-  bool result;
+  Dali::Shader result;
 
   if (!jarg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
@@ -10437,17 +10062,13 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterProperty(char * jarg1, char * ja
   }
   std::string arg2_str(jarg2);
   arg2 = &arg2_str;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Type)jarg4;
-  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5;
-  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6;
   {
     try {
-      result = (bool)Dali::CSharpTypeRegistry::RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+      result = Dali::Shader::New((std::string const &)*arg1,(std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Shader((const Dali::Shader &)result);
 
   //argout typemap for const std::string&
 
@@ -10458,675 +10079,513 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RegisterProperty(char * jarg1, char * ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ResizePolicyDefault_get() {
-  int jresult ;
-  Dali::ResizePolicy::Type result;
-
-  result = (Dali::ResizePolicy::Type)(Dali::ResizePolicy::Type)Dali::ResizePolicy::DEFAULT;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Count(void * jarg1) {
-  unsigned long jresult ;
-  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
-  Dali::VectorBase::SizeType result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader(void * jarg1) {
+  Dali::Shader *arg1 = (Dali::Shader *) 0 ;
 
-  arg1 = (Dali::VectorBase *)jarg1;
+  arg1 = (Dali::Shader *)jarg1;
   {
     try {
-      result = ((Dali::VectorBase const *)arg1)->Count();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Size(void * jarg1) {
-  unsigned long jresult ;
-  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
-  Dali::VectorBase::SizeType result;
-
-  arg1 = (Dali::VectorBase *)jarg1;
-  {
-    try {
-      result = ((Dali::VectorBase const *)arg1)->Size();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_INDEX_get() {
+  int jresult ;
+  int result;
 
-  jresult = (unsigned long)result;
+  result = (int)Dali::Renderer::Property::DEPTH_INDEX;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_VectorBase_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
-  bool result;
-
-  arg1 = (Dali::VectorBase *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::VectorBase const *)arg1)->Empty();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_FACE_CULLING_MODE_get() {
+  int jresult ;
+  int result;
 
-  jresult = result;
+  result = (int)Dali::Renderer::Property::FACE_CULLING_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Capacity(void * jarg1) {
-  unsigned long jresult ;
-  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
-  Dali::VectorBase::SizeType result;
-
-  arg1 = (Dali::VectorBase *)jarg1;
-  {
-    try {
-      result = ((Dali::VectorBase const *)arg1)->Capacity();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_MODE_get() {
+  int jresult ;
+  int result;
 
-  jresult = (unsigned long)result;
+  result = (int)Dali::Renderer::Property::BLEND_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorBase_Release(void * jarg1) {
-  Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
-
-  arg1 = (Dali::VectorBase *)jarg1;
-  {
-    try {
-      (arg1)->Release();
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_RGB_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::Renderer::Property::BLEND_EQUATION_RGB;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FIRST_VALID_PIXEL_FORMAT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_ALPHA_get() {
   int jresult ;
-  Dali::Pixel::Format result;
+  int result;
 
-  result = (Dali::Pixel::Format)(Dali::Pixel::Format)Dali::Pixel::FIRST_VALID_PIXEL_FORMAT;
+  result = (int)Dali::Renderer::Property::BLEND_EQUATION_ALPHA;
   jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LAST_VALID_PIXEL_FORMAT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_RGB_get() {
   int jresult ;
-  Dali::Pixel::Format result;
+  int result;
 
-  result = (Dali::Pixel::Format)(Dali::Pixel::Format)Dali::Pixel::LAST_VALID_PIXEL_FORMAT;
+  result = (int)Dali::Renderer::Property::BLEND_FACTOR_SRC_RGB;
   jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_HasAlpha(int jarg1) {
-  bool jresult ;
-  Dali::Pixel::Format arg1 ;
-  bool result;
-
-  arg1 = (Dali::Pixel::Format)jarg1;
-  {
-    try {
-      result = (bool)Dali::Pixel::HasAlpha(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_RGB_get() {
+  int jresult ;
+  int result;
 
-  jresult = result;
+  result = (int)Dali::Renderer::Property::BLEND_FACTOR_DEST_RGB;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GetBytesPerPixel(int jarg1) {
-  unsigned int jresult ;
-  Dali::Pixel::Format arg1 ;
-  unsigned int result;
-
-  arg1 = (Dali::Pixel::Format)jarg1;
-  {
-    try {
-      result = (unsigned int)Dali::Pixel::GetBytesPerPixel(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_ALPHA_get() {
+  int jresult ;
+  int result;
 
-  jresult = result;
+  result = (int)Dali::Renderer::Property::BLEND_FACTOR_SRC_ALPHA;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GetAlphaOffsetAndMask(int jarg1, void * jarg2, void * jarg3) {
-  Dali::Pixel::Format arg1 ;
-  int *arg2 = 0 ;
-  int *arg3 = 0 ;
-
-  arg1 = (Dali::Pixel::Format)jarg1;
-  arg2 = (int *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "int & type is null", 0);
-    return ;
-  }
-  arg3 = (int *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "int & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      Dali::Pixel::GetAlphaOffsetAndMask(arg1,*arg2,*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_ALPHA_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::Renderer::Property::BLEND_FACTOR_DEST_ALPHA;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelData_New(unsigned char* nuiBuffer, unsigned int nuiBufferSize, unsigned int nuiWidth, unsigned int nuiHeight, int nuiPixelFormat) {
-  void * jresult ;
-  Dali::PixelData result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_COLOR_get() {
+  int jresult ;
+  int result;
 
-  {
-    unsigned char* copiedBuffer;
-    try
-    {
-      copiedBuffer = new unsigned char[nuiBufferSize];
-    } CALL_CATCH_EXCEPTION(0);
+  result = (int)Dali::Renderer::Property::BLEND_COLOR;
+  jresult = (int)result;
+  return jresult;
+}
 
-    try
-    {
-      // Note : copiedBuffer created by 'new' method. So ReleaseFunction always be DELETE_ARRAY.
-      memcpy(copiedBuffer, nuiBuffer, nuiBufferSize);
-      result = Dali::PixelData::New(copiedBuffer, nuiBufferSize, nuiWidth, nuiHeight, (Dali::Pixel::Format)nuiPixelFormat, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
-    } CALL_CATCH_EXCEPTION_WITH_FUNCTION(0, [](unsigned char* buffer){delete[] buffer;}, copiedBuffer);
-  }
 
-  jresult = new Dali::PixelData((const Dali::PixelData &)result);
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_PRE_MULTIPLIED_ALPHA_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PixelData__SWIG_0() {
-  void * jresult ;
-  Dali::PixelData *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PixelData *)new Dali::PixelData();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_FIRST_get() {
+  int jresult ;
+  int result;
 
-  jresult = (void *)result;
+  result = (int)Dali::Renderer::Property::INDEX_RANGE_FIRST;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PixelData(void * nuiHandle) {
-  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
-
-  pixelData = (Dali::PixelData *)nuiHandle;
-  {
-    try {
-      delete pixelData;
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_COUNT_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::Renderer::Property::INDEX_RANGE_COUNT;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PixelData__SWIG_1(void * nuiHandle) {
-  void * jresult ;
-  Dali::PixelData *pixelData = 0 ;
-  Dali::PixelData *result = 0 ;
-
-  pixelData = (Dali::PixelData *)nuiHandle;
-  if (!pixelData) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PixelData const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PixelData *)new Dali::PixelData((Dali::PixelData const &)*pixelData);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_WRITE_MODE_get() {
+  int jresult ;
+  int result;
 
-  jresult = (void *)result;
+  result = (int)Dali::Renderer::Property::DEPTH_WRITE_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelData_Assign(void * nuiHandle, void * nuiHandleSource) {
-  void * jresult ;
-  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
-  Dali::PixelData *pixelDataSource = 0 ;
-  Dali::PixelData *result = 0 ;
-
-  pixelData = (Dali::PixelData *)nuiHandle;
-  pixelDataSource = (Dali::PixelData *)nuiHandleSource;
-  if (!pixelDataSource) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PixelData const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PixelData *) &(pixelData)->operator =((Dali::PixelData const &)*pixelDataSource);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_FUNCTION_get() {
+  int jresult ;
+  int result;
 
-  jresult = (void *)result;
+  result = (int)Dali::Renderer::Property::DEPTH_FUNCTION;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetWidth(void * nuiHandle) {
-  unsigned int jresult ;
-  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_TEST_MODE_get() {
+  int jresult ;
+  int result;
 
-  pixelData = (Dali::PixelData *)nuiHandle;
-  {
-    try {
-      result = (unsigned int)((Dali::PixelData const *)pixelData)->GetWidth();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
+  result = (int)Dali::Renderer::Property::DEPTH_TEST_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetHeight(void * nuiHandle) {
-  unsigned int jresult ;
-  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
-  unsigned int result;
-
-  pixelData = (Dali::PixelData *)nuiHandle;
-  {
-    try {
-      result = (unsigned int)((Dali::PixelData const *)pixelData)->GetHeight();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_RENDER_MODE_get() {
+  int jresult ;
+  int result;
 
-  jresult = result;
+  result = (int)Dali::Renderer::Property::RENDER_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PixelData_GetPixelFormat(void * nuiHandle) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_get() {
   int jresult ;
-  Dali::PixelData *pixelData = (Dali::PixelData *) 0 ;
-  Dali::Pixel::Format result;
-
-  pixelData = (Dali::PixelData *)nuiHandle;
-  {
-    try {
-      result = (Dali::Pixel::Format)((Dali::PixelData const *)pixelData)->GetPixelFormat();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  int result;
 
+  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION;
   jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PixelData_GenerateUrl(void* nuiHandle)
-{
-  Dali::PixelData *pixelData = (Dali::PixelData*)nuiHandle;
-  Dali::Toolkit::ImageUrl result;
-  void *jresult;
 
-  if (!pixelData)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "some argument is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Toolkit::Image::GenerateUrl(*pixelData);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_MASK_get() {
+  int jresult ;
+  int result;
 
-  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl&)result);
+  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION_MASK;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_X_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_REFERENCE_get() {
+  int jresult ;
+  int result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_X;
-  jresult = result;
+  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION_REFERENCE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_X_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_MASK_get() {
+  int jresult ;
+  int result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_X;
-  jresult = result;
+  result = (int)Dali::Renderer::Property::STENCIL_MASK;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Y_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_FAIL_get() {
+  int jresult ;
+  int result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_Y;
-  jresult = result;
+  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_FAIL;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Y_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_FAIL_get() {
+  int jresult ;
+  int result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_Y;
-  jresult = result;
+  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_FAIL;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Z_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_PASS_get() {
+  int jresult ;
+  int result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::POSITIVE_Z;
-  jresult = result;
+  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_PASS;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Z_get() {
-  unsigned int jresult ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_New(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Geometry *arg1 = 0 ;
+  Dali::Shader *arg2 = 0 ;
+  Dali::Renderer result;
 
-  result = (unsigned int)(unsigned int)Dali::CubeMapLayer::NEGATIVE_Z;
-  jresult = result;
+  arg1 = (Dali::Geometry *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::Shader *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = Dali::Renderer::New(*arg1,*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Renderer((const Dali::Renderer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_0(int jarg1, int jarg2, unsigned int jarg3, unsigned int jarg4) {
-  void * jresult ;
-  Dali::TextureType::Type arg1 ;
-  Dali::Pixel::Format arg2 ;
-  unsigned int arg3 ;
-  unsigned int arg4 ;
-  Dali::Texture result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer(void * jarg1) {
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
 
-  arg1 = (Dali::TextureType::Type)jarg1;
-  arg2 = (Dali::Pixel::Format)jarg2;
-  arg3 = (unsigned int)jarg3;
-  arg4 = (unsigned int)jarg4;
+  arg1 = (Dali::Renderer *)jarg1;
   {
     try {
-      result = Dali::Texture::New(arg1,arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Texture((const Dali::Texture &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_1(void * jarg1) {
-  void * jresult ;
-  NativeImageInterface *arg1 = 0 ;
-  Dali::Texture result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetGeometry(void * jarg1, void * jarg2) {
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+  Dali::Geometry *arg2 = 0 ;
 
-  arg1 = (NativeImageInterface *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "NativeImageInterface & type is null", 0);
-    return 0;
+  arg1 = (Dali::Renderer *)jarg1;
+  arg2 = (Dali::Geometry *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry & type is null", 0);
+    return ;
   }
   {
     try {
-      result = Dali::Texture::New(*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetGeometry(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Texture((const Dali::Texture &)result);
-  return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Texture__SWIG_0() {
-  void * jresult ;
-  Dali::Texture *result = 0 ;
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetIndexRange(void * jarg1, int jarg2, int jarg3) {
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+  int arg2 ;
+  int arg3 ;
+
+  arg1 = (Dali::Renderer *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (Dali::Texture *)new Dali::Texture();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetIndexRange(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Texture(void * jarg1) {
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetTextures(void * jarg1, void * jarg2) {
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+  Dali::TextureSet *arg2 = 0 ;
 
-  arg1 = (Dali::Texture *)jarg1;
+  arg1 = (Dali::Renderer *)jarg1;
+  arg2 = (Dali::TextureSet *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TextureSet & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->SetTextures(*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Texture__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetTextures(void * jarg1) {
   void * jresult ;
-  Dali::Texture *arg1 = 0 ;
-  Dali::Texture *result = 0 ;
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+  Dali::TextureSet result;
 
-  arg1 = (Dali::Texture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Renderer *)jarg1;
   {
     try {
-      result = (Dali::Texture *)new Dali::Texture((Dali::Texture const &)*arg1);
+      result = ((Dali::Renderer const *)arg1)->GetTextures();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::TextureSet((const Dali::TextureSet &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Texture result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetShader(void * jarg1, void * jarg2) {
+  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+  Dali::Shader *arg2 = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
+  arg1 = (Dali::Renderer *)jarg1;
+  arg2 = (Dali::Shader *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader & type is null", 0);
+    return ;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::Texture::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetShader(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Texture((const Dali::Texture &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_New(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
   void * jresult ;
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
-  Dali::Texture *arg2 = 0 ;
-  Dali::Texture *result = 0 ;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  unsigned int arg3 ;
+  Dali::FrameBuffer result;
 
-  arg1 = (Dali::Texture *)jarg1;
-  arg2 = (Dali::Texture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture const & type is null", 0);
-    return 0;
-  }
+  arg1 = (unsigned int)jarg1;
+  arg2 = (unsigned int)jarg2;
+  arg3 = (unsigned int)jarg3;
   {
     try {
-      result = (Dali::Texture *) &(arg1)->operator =((Dali::Texture const &)*arg2);
+      result = Dali::FrameBuffer::New(arg1,arg2,static_cast<Dali::FrameBuffer::Attachment::Mask>(arg3));
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_0(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
-  Dali::PixelData arg2 ;
-  Dali::PixelData *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer(void * jarg1) {
+  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
 
-  arg1 = (Dali::Texture *)jarg1;
-  argp2 = (Dali::PixelData *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PixelData", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::FrameBuffer *)jarg1;
   {
     try {
-      result = (bool)(arg1)->Upload(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, unsigned int jarg7, unsigned int jarg8) {
-  bool jresult ;
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
-  Dali::PixelData arg2 ;
-  unsigned int arg3 ;
-  unsigned int arg4 ;
-  unsigned int arg5 ;
-  unsigned int arg6 ;
-  unsigned int arg7 ;
-  unsigned int arg8 ;
-  Dali::PixelData *argp2 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_0(void * jarg1, void * jarg2) {
+  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
+  Dali::Texture *arg2 = 0 ;
 
-  arg1 = (Dali::Texture *)jarg1;
-  argp2 = (Dali::PixelData *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PixelData", 0);
-    return 0;
+  arg1 = (Dali::FrameBuffer *)jarg1;
+  arg2 = (Dali::Texture *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture & type is null", 0);
+    return ;
   }
-  arg2 = *argp2;
-  arg3 = (unsigned int)jarg3;
-  arg4 = (unsigned int)jarg4;
-  arg5 = (unsigned int)jarg5;
-  arg6 = (unsigned int)jarg6;
-  arg7 = (unsigned int)jarg7;
-  arg8 = (unsigned int)jarg8;
   {
     try {
-      result = (bool)(arg1)->Upload(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->AttachColorTexture(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Texture_GenerateMipmaps(void * jarg1) {
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
+  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
+  Dali::Texture *arg2 = 0 ;
+  unsigned int arg3 ;
+  unsigned int arg4 ;
 
-  arg1 = (Dali::Texture *)jarg1;
+  arg1 = (Dali::FrameBuffer *)jarg1;
+  arg2 = (Dali::Texture *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture & type is null", 0);
+    return ;
+  }
+  arg3 = (unsigned int)jarg3;
+  arg4 = (unsigned int)jarg4;
   {
     try {
-      (arg1)->GenerateMipmaps();
+      (arg1)->AttachColorTexture(*arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetWidth(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_GetColorTexture(void * jarg1) {
+  void * jresult ;
+  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
+  Dali::Texture result;
 
-  arg1 = (Dali::Texture *)jarg1;
+  arg1 = (Dali::FrameBuffer *)jarg1;
   {
     try {
-      result = (unsigned int)((Dali::Texture const *)arg1)->GetWidth();
+      result = (arg1)->GetColorTexture();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Texture((const Dali::Texture &)result);
   return jresult;
 }
 
+SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_FrameBuffer_GenerateUrl(void *jFrameBuffer, int pixelFormat, int width, int height)
+{
+  void *jresult;
+  Dali::Toolkit::ImageUrl result;
+  Dali::FrameBuffer *frameBuffer = (Dali::FrameBuffer*)jFrameBuffer;;
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetHeight(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Texture *arg1 = (Dali::Texture *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::Texture *)jarg1;
+  if (!frameBuffer)
   {
-    try {
-      result = (unsigned int)((Dali::Texture const *)arg1)->GetHeight();
-    } CALL_CATCH_EXCEPTION(0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::FrameBuffer is null", 0);
+    return 0;
   }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_New() {
-  void * jresult ;
-  Dali::Sampler result;
-
   {
-    try {
-      result = Dali::Sampler::New();
-    } CALL_CATCH_EXCEPTION(0);
+    try
+    {
+      result = Dali::Toolkit::Image::GenerateUrl((const Dali::FrameBuffer&)*frameBuffer, (Pixel::Format)pixelFormat, (uint32_t)width, (uint32_t)height);
+    }
+    CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Sampler((const Dali::Sampler &)result);
+  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskList__SWIG_0() {
   void * jresult ;
-  Dali::Sampler *result = 0 ;
+  Dali::RenderTaskList *result = 0 ;
 
   {
     try {
-      result = (Dali::Sampler *)new Dali::Sampler();
+      result = (Dali::RenderTaskList *)new Dali::RenderTaskList();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -11135,10 +10594,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Sampler(void * jarg1) {
-  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskList(void * jarg1) {
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
 
-  arg1 = (Dali::Sampler *)jarg1;
+  arg1 = (Dali::RenderTaskList *)jarg1;
   {
     try {
       delete arg1;
@@ -11148,19 +10607,21 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Sampler(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Sampler *arg1 = 0 ;
-  Dali::Sampler *result = 0 ;
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
+  Dali::RenderTaskList *arg2 = 0 ;
+  Dali::RenderTaskList *result = 0 ;
 
-  arg1 = (Dali::Sampler *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Sampler const & type is null", 0);
+  arg1 = (Dali::RenderTaskList *)jarg1;
+  arg2 = (Dali::RenderTaskList *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTaskList const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Sampler *)new Dali::Sampler((Dali::Sampler const &)*arg1);
+      result = (Dali::RenderTaskList *) &(arg1)->operator =((Dali::RenderTaskList const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -11169,344 +10630,211 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Sampler result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Sampler::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Sampler((const Dali::Sampler &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_CreateTask(void * jarg1) {
   void * jresult ;
-  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
-  Dali::Sampler *arg2 = 0 ;
-  Dali::Sampler *result = 0 ;
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
+  Dali::RenderTask result;
 
-  arg1 = (Dali::Sampler *)jarg1;
-  arg2 = (Dali::Sampler *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Sampler const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::RenderTaskList *)jarg1;
   {
     try {
-      result = (Dali::Sampler *) &(arg1)->operator =((Dali::Sampler const &)*arg2);
+      result = (arg1)->CreateTask();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::RenderTask((const Dali::RenderTask &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetFilterMode(void * jarg1, int jarg2, int jarg3) {
-  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
-  Dali::FilterMode::Type arg2 ;
-  Dali::FilterMode::Type arg3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTaskList_RemoveTask(void * jarg1, void * jarg2) {
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
+  Dali::RenderTask arg2 ;
+  Dali::RenderTask *argp2 ;
 
-  arg1 = (Dali::Sampler *)jarg1;
-  arg2 = (Dali::FilterMode::Type)jarg2;
-  arg3 = (Dali::FilterMode::Type)jarg3;
-  {
-    try {
-      (arg1)->SetFilterMode(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (Dali::RenderTaskList *)jarg1;
+  argp2 = (Dali::RenderTask *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::RenderTask", 0);
+    return ;
   }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_0(void * jarg1, int jarg2, int jarg3) {
-  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
-  Dali::WrapMode::Type arg2 ;
-  Dali::WrapMode::Type arg3 ;
-
-  arg1 = (Dali::Sampler *)jarg1;
-  arg2 = (Dali::WrapMode::Type)jarg2;
-  arg3 = (Dali::WrapMode::Type)jarg3;
+  arg2 = *argp2;
   {
     try {
-      (arg1)->SetWrapMode(arg2,arg3);
+      (arg1)->RemoveTask(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_1(void * jarg1, int jarg2, int jarg3, int jarg4) {
-  Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
-  Dali::WrapMode::Type arg2 ;
-  Dali::WrapMode::Type arg3 ;
-  Dali::WrapMode::Type arg4 ;
-
-  arg1 = (Dali::Sampler *)jarg1;
-  arg2 = (Dali::WrapMode::Type)jarg2;
-  arg3 = (Dali::WrapMode::Type)jarg3;
-  arg4 = (Dali::WrapMode::Type)jarg4;
-  {
-    try {
-      (arg1)->SetWrapMode(arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
+//// ===============================================end part 1 =================
 
+//// ========================= part 2 ===============================
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_New() {
-  void * jresult ;
-  Dali::TextureSet result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTaskCount(void * jarg1) {
+  unsigned int jresult ;
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
+  unsigned int result;
 
+  arg1 = (Dali::RenderTaskList *)jarg1;
   {
     try {
-      result = Dali::TextureSet::New();
+      result = (unsigned int)((Dali::RenderTaskList const *)arg1)->GetTaskCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TextureSet((const Dali::TextureSet &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextureSet__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTask(void * jarg1, unsigned int jarg2) {
   void * jresult ;
-  Dali::TextureSet *result = 0 ;
+  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
+  unsigned int arg2 ;
+  Dali::RenderTask result;
 
+  arg1 = (Dali::RenderTaskList *)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      result = (Dali::TextureSet *)new Dali::TextureSet();
+      result = ((Dali::RenderTaskList const *)arg1)->GetTask(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::RenderTask((const Dali::RenderTask &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextureSet(void * jarg1) {
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_POSITION_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::RenderTask::Property::VIEWPORT_POSITION;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextureSet__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::TextureSet *arg1 = 0 ;
-  Dali::TextureSet *result = 0 ;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TextureSet const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TextureSet *)new Dali::TextureSet((Dali::TextureSet const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_SIZE_get() {
+  int jresult ;
+  int result;
 
-  jresult = (void *)result;
+  result = (int)Dali::RenderTask::Property::VIEWPORT_SIZE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::TextureSet result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_CLEAR_COLOR_get() {
+  int jresult ;
+  int result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::TextureSet::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  result = (int)Dali::RenderTask::Property::CLEAR_COLOR;
+  jresult = (int)result;
+  return jresult;
+}
 
-  jresult = new Dali::TextureSet((const Dali::TextureSet &)result);
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_REQUIRES_SYNC_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::RenderTask::Property::REQUIRES_SYNC;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION_get() {
   void * jresult ;
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  Dali::TextureSet *arg2 = 0 ;
-  Dali::TextureSet *result = 0 ;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  arg2 = (Dali::TextureSet *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TextureSet const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TextureSet *) &(arg1)->operator =((Dali::TextureSet const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  bool (*result)(Dali::Vector2 &) = 0 ;
 
+  result = (bool (*)(Dali::Vector2 &))Dali::RenderTask::DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetTexture(void * jarg1, unsigned long jarg2, void * jarg3) {
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  size_t arg2 ;
-  Dali::Texture arg3 ;
-  Dali::Texture *argp3 ;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  arg2 = (size_t)jarg2;
-  argp3 = (Dali::Texture *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->SetTexture(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCTION_get() {
+  void * jresult ;
+  bool (*result)(Dali::Vector2 &) = 0 ;
 
+  result = (bool (*)(Dali::Vector2 &))Dali::RenderTask::FULLSCREEN_FRAMEBUFFER_FUNCTION;
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetTexture(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  size_t arg2 ;
-  Dali::Texture result;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TextureSet const *)arg1)->GetTexture(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_EXCLUSIVE_get() {
+  bool jresult ;
+  bool result;
 
-  jresult = new Dali::Texture((const Dali::Texture &)result);
+  result = (bool)Dali::RenderTask::DEFAULT_EXCLUSIVE;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetSampler(void * jarg1, unsigned long jarg2, void * jarg3) {
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  size_t arg2 ;
-  Dali::Sampler arg3 ;
-  Dali::Sampler *argp3 ;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  arg2 = (size_t)jarg2;
-  argp3 = (Dali::Sampler *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Sampler", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->SetSampler(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_INPUT_ENABLED_get() {
+  bool jresult ;
+  bool result;
 
+  result = (bool)Dali::RenderTask::DEFAULT_INPUT_ENABLED;
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetSampler(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_COLOR_get() {
   void * jresult ;
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  size_t arg2 ;
-  Dali::Sampler result;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TextureSet const *)arg1)->GetSampler(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  Dali::Vector4 *result = 0 ;
 
-  jresult = new Dali::Sampler((const Dali::Sampler &)result);
+  result = (Dali::Vector4 *)&Dali::RenderTask::DEFAULT_CLEAR_COLOR;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextureSet_GetTextureCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::TextureSet *)jarg1;
-  {
-    try {
-      result = ((Dali::TextureSet const *)arg1)->GetTextureCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_ENABLED_get() {
+  bool jresult ;
+  bool result;
 
-  jresult = (unsigned long)result;
+  result = (bool)Dali::RenderTask::DEFAULT_CLEAR_ENABLED;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VertexBuffer_New(void * jarg1) {
-  void * jresult ;
-  Dali::Property::Map *arg1 = 0 ;
-  Dali::VertexBuffer result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CULL_MODE_get() {
+  bool jresult ;
+  bool result;
 
-  arg1 = (Dali::Property::Map *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Property::Map & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = Dali::VertexBuffer::New(*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  result = (bool)Dali::RenderTask::DEFAULT_CULL_MODE;
+  jresult = result;
+  return jresult;
+}
 
-  jresult = new Dali::VertexBuffer((const Dali::VertexBuffer &)result);
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_REFRESH_RATE_get() {
+  unsigned int jresult ;
+  unsigned int result;
+
+  result = (unsigned int)(unsigned int)Dali::RenderTask::DEFAULT_REFRESH_RATE;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VertexBuffer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_0() {
   void * jresult ;
-  Dali::VertexBuffer *result = 0 ;
+  Dali::RenderTask *result = 0 ;
 
   {
     try {
-      result = (Dali::VertexBuffer *)new Dali::VertexBuffer();
+      result = (Dali::RenderTask *)new Dali::RenderTask();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -11515,10 +10843,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VertexBuffer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VertexBuffer(void * jarg1) {
-  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTask(void * jarg1) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
 
-  arg1 = (Dali::VertexBuffer *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
       delete arg1;
@@ -11528,19 +10856,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VertexBuffer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VertexBuffer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::VertexBuffer *arg1 = 0 ;
-  Dali::VertexBuffer *result = 0 ;
+  Dali::RenderTask *arg1 = 0 ;
+  Dali::RenderTask *result = 0 ;
 
-  arg1 = (Dali::VertexBuffer *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::VertexBuffer const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTask const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::VertexBuffer *)new Dali::VertexBuffer((Dali::VertexBuffer const &)*arg1);
+      result = (Dali::RenderTask *)new Dali::RenderTask((Dali::RenderTask const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -11549,782 +10877,780 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VertexBuffer__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VertexBuffer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::VertexBuffer result;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::RenderTask *arg2 = 0 ;
+  Dali::RenderTask *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = (Dali::RenderTask *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTask const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::VertexBuffer::DownCast(arg1);
+      result = (Dali::RenderTask *) &(arg1)->operator =((Dali::RenderTask const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::VertexBuffer((const Dali::VertexBuffer &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VertexBuffer_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
-  Dali::VertexBuffer *arg2 = 0 ;
-  Dali::VertexBuffer *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetSourceActor(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::Actor *argp2 ;
 
-  arg1 = (Dali::VertexBuffer *)jarg1;
-  arg2 = (Dali::VertexBuffer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::VertexBuffer const & type is null", 0);
-    return 0;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
   }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::VertexBuffer *) &(arg1)->operator =((Dali::VertexBuffer const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetSourceActor(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VertexBuffer_SetData(void * jarg1, void * jarg2, unsigned long jarg3) {
-  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
-  void *arg2 = (void *) 0 ;
-  std::size_t arg3 ;
-
-  arg1 = (Dali::VertexBuffer *)jarg1;
-  arg2 = jarg2;
-  arg3 = (std::size_t)jarg3;
-  {
-    try {
-      (arg1)->SetData((void const *)arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VertexBuffer_GetSize(void * jarg1) {
-  unsigned long jresult ;
-  Dali::VertexBuffer *arg1 = (Dali::VertexBuffer *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetSourceActor(void * jarg1) {
+  void * jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Actor result;
 
-  arg1 = (Dali::VertexBuffer *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = ((Dali::VertexBuffer const *)arg1)->GetSize();
+      result = ((Dali::RenderTask const *)arg1)->GetSourceActor();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = new Dali::Actor((const Dali::Actor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_New() {
-  void * jresult ;
-  Dali::Geometry result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetExclusive(void * jarg1, bool jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool arg2 ;
 
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = jarg2 ? true : false;
   {
     try {
-      result = Dali::Geometry::New();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetExclusive(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Geometry((const Dali::Geometry &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Geometry__SWIG_0() {
-  void * jresult ;
-  Dali::Geometry *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_IsExclusive(void * jarg1) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool result;
 
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Geometry *)new Dali::Geometry();
+      result = (bool)((Dali::RenderTask const *)arg1)->IsExclusive();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Geometry(void * jarg1) {
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetInputEnabled(void * jarg1, bool jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool arg2 ;
 
-  arg1 = (Dali::Geometry *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = jarg2 ? true : false;
   {
     try {
-      delete arg1;
+      (arg1)->SetInputEnabled(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Geometry__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Geometry *arg1 = 0 ;
-  Dali::Geometry *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetInputEnabled(void * jarg1) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Geometry *)new Dali::Geometry((Dali::Geometry const &)*arg1);
+      result = (bool)((Dali::RenderTask const *)arg1)->GetInputEnabled();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Geometry result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCameraActor(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::CameraActor arg2 ;
+  Dali::CameraActor *argp2 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::CameraActor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::CameraActor", 0);
+    return ;
   }
-  arg1 = *argp1;
+  arg2 = *argp2;
   {
     try {
-      result = Dali::Geometry::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetCameraActor(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Geometry((const Dali::Geometry &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCameraActor(void * jarg1) {
   void * jresult ;
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  Dali::Geometry *arg2 = 0 ;
-  Dali::Geometry *result = 0 ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::CameraActor result;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  arg2 = (Dali::Geometry *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Geometry *) &(arg1)->operator =((Dali::Geometry const &)*arg2);
+      result = ((Dali::RenderTask const *)arg1)->GetCameraActor();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_AddVertexBuffer(void * jarg1, void * jarg2) {
-  unsigned long jresult ;
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  Dali::VertexBuffer *arg2 = 0 ;
-  std::size_t result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetFrameBuffer(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::FrameBuffer arg2 ;
+  Dali::FrameBuffer *argp2 ;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  arg2 = (Dali::VertexBuffer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::VertexBuffer & type is null", 0);
-    return 0;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::FrameBuffer *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::FrameBuffer", 0);
+    return ;
   }
+  arg2 = *argp2;
   {
     try {
-      result = (arg1)->AddVertexBuffer(*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetFrameBuffer(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_GetNumberOfVertexBuffers(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetFrameBuffer(void * jarg1) {
+  void * jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::FrameBuffer result;
 
-  arg1 = (Dali::Geometry *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = ((Dali::Geometry const *)arg1)->GetNumberOfVertexBuffers();
+      result = ((Dali::RenderTask const *)arg1)->GetFrameBuffer();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_RemoveVertexBuffer(void * jarg1, unsigned long jarg2) {
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  std::size_t arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferFunction(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::RenderTask::ScreenToFrameBufferFunction arg2 = (Dali::RenderTask::ScreenToFrameBufferFunction) 0 ;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  arg2 = (std::size_t)jarg2;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = (Dali::RenderTask::ScreenToFrameBufferFunction)jarg2;
   {
     try {
-      (arg1)->RemoveVertexBuffer(arg2);
+      (arg1)->SetScreenToFrameBufferFunction(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetIndexBuffer(void * jarg1, unsigned short* jarg2, unsigned long jarg3) {
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  unsigned short *arg2 = (unsigned short *) 0 ;
-  size_t arg3 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferFunction(void * jarg1) {
+  void * jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::RenderTask::ScreenToFrameBufferFunction result;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  arg2 = jarg2;
-  arg3 = (size_t)jarg3;
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      (arg1)->SetIndexBuffer((unsigned short const *)arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::RenderTask::ScreenToFrameBufferFunction)((Dali::RenderTask const *)arg1)->GetScreenToFrameBufferFunction();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-
-
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetType(void * jarg1, int jarg2) {
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  Dali::Geometry::Type arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferMappingActor(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::Actor *argp2 ;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  arg2 = (Dali::Geometry::Type)jarg2;
-  {
-    try {
-      (arg1)->SetType(arg2);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
   }
-
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Geometry_GetType(void * jarg1) {
-  int jresult ;
-  Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
-  Dali::Geometry::Type result;
-
-  arg1 = (Dali::Geometry *)jarg1;
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::Geometry::Type)((Dali::Geometry const *)arg1)->GetType();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetScreenToFrameBufferMappingActor(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader_Hint() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferMappingActor(void * jarg1) {
   void * jresult ;
-  Dali::Shader::Hint *result = 0 ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Actor result;
 
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Shader::Hint *)new Dali::Shader::Hint();
+      result = ((Dali::RenderTask const *)arg1)->GetScreenToFrameBufferMappingActor();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Actor((const Dali::Actor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader_Hint(void * jarg1) {
-  Dali::Shader::Hint *arg1 = (Dali::Shader::Hint *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportPosition(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector2 arg2 ;
+  Dali::Vector2 *argp2 ;
 
-  arg1 = (Dali::Shader::Hint *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Vector2 *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      delete arg1;
+      (arg1)->SetViewportPosition(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Shader_Property_PROGRAM_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Shader::Property::PROGRAM;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportPosition(void * jarg1) {
   void * jresult ;
-  Dali::Shader::Property *result = 0 ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector2 result;
 
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Shader::Property *)new Dali::Shader::Property();
+      result = ((Dali::RenderTask const *)arg1)->GetCurrentViewportPosition();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader_Property(void * jarg1) {
-  Dali::Shader::Property *arg1 = (Dali::Shader::Property *) 0 ;
-
-  arg1 = (Dali::Shader::Property *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportSize(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector2 arg2 ;
+  Dali::Vector2 *argp2 ;
+
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Vector2 *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      delete arg1;
+      (arg1)->SetViewportSize(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_0(char * jarg1, char * jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportSize(void * jarg1) {
   void * jresult ;
-  std::string *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Shader::Hint::Value arg3 ;
-  Dali::Shader result;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector2 result;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Shader::Hint::Value)jarg3;
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = Dali::Shader::New((std::string const &)*arg1,(std::string const &)*arg2,arg3);
+      result = ((Dali::RenderTask const *)arg1)->GetCurrentViewportSize();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Shader((const Dali::Shader &)result);
-
-  //argout typemap for const std::string&
-
-
-  //argout typemap for const std::string&
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_1(char * jarg1, char * jarg2) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Shader result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewport(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Viewport arg2 ;
+  Dali::Viewport *argp2 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Viewport *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Viewport", 0);
+    return ;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
+  arg2 = *argp2;
   {
     try {
-      result = Dali::Shader::New((std::string const &)*arg1,(std::string const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetViewport(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Shader((const Dali::Shader &)result);
-
-  //argout typemap for const std::string&
-
-
-  //argout typemap for const std::string&
-
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetViewport(void * jarg1) {
   void * jresult ;
-  Dali::Shader *result = 0 ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Viewport result;
 
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Shader *)new Dali::Shader();
+      result = ((Dali::RenderTask const *)arg1)->GetViewport();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Viewport((const Dali::Viewport &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader(void * jarg1) {
-  Dali::Shader *arg1 = (Dali::Shader *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearColor(void * jarg1, void * jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector4 *arg2 = 0 ;
 
-  arg1 = (Dali::Shader *)jarg1;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = (Dali::Vector4 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->SetClearColor((Dali::Vector4 const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetClearColor(void * jarg1) {
   void * jresult ;
-  Dali::Shader *arg1 = 0 ;
-  Dali::Shader *result = 0 ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector4 result;
 
-  arg1 = (Dali::Shader *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Shader *)new Dali::Shader((Dali::Shader const &)*arg1);
+      result = ((Dali::RenderTask const *)arg1)->GetClearColor();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Shader result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearEnabled(void * jarg1, bool jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool arg2 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = jarg2 ? true : false;
   {
     try {
-      result = Dali::Shader::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetClearEnabled(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Shader((const Dali::Shader &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Shader *arg1 = (Dali::Shader *) 0 ;
-  Dali::Shader *arg2 = 0 ;
-  Dali::Shader *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetClearEnabled(void * jarg1) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Shader *)jarg1;
-  arg2 = (Dali::Shader *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = (Dali::Shader *) &(arg1)->operator =((Dali::Shader const &)*arg2);
+      result = (bool)((Dali::RenderTask const *)arg1)->GetClearEnabled();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_INDEX_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Renderer::Property::DEPTH_INDEX;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCullMode(void * jarg1, bool jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool arg2 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_FACE_CULLING_MODE_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = jarg2 ? true : false;
+  {
+    try {
+      (arg1)->SetCullMode(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::Renderer::Property::FACE_CULLING_MODE;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_MODE_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetCullMode(void * jarg1) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  bool result;
 
-  result = (int)Dali::Renderer::Property::BLEND_MODE;
-  jresult = (int)result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  {
+    try {
+      result = (bool)((Dali::RenderTask const *)arg1)->GetCullMode();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_RGB_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetRefreshRate(void * jarg1, unsigned int jarg2) {
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  unsigned int arg2 ;
+
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = (unsigned int)jarg2;
+  {
+    try {
+      (arg1)->SetRefreshRate(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::Renderer::Property::BLEND_EQUATION_RGB;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_ALPHA_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetRefreshRate(void * jarg1) {
+  unsigned int jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  unsigned int result;
 
-  result = (int)Dali::Renderer::Property::BLEND_EQUATION_ALPHA;
-  jresult = (int)result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  {
+    try {
+      result = (unsigned int)((Dali::RenderTask const *)arg1)->GetRefreshRate();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_RGB_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_WorldToViewport(void * jarg1, void * jarg2, float * jarg3, float * jarg4) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  float *arg3 = 0 ;
+  float *arg4 = 0 ;
+  bool result;
 
-  result = (int)Dali::Renderer::Property::BLEND_FACTOR_SRC_RGB;
-  jresult = (int)result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return 0;
+  }
+  arg3 = (float *)jarg3;
+  arg4 = (float *)jarg4;
+  {
+    try {
+      result = (bool)((Dali::RenderTask const *)arg1)->WorldToViewport((Dali::Vector3 const &)*arg2,*arg3,*arg4);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_RGB_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Renderer::Property::BLEND_FACTOR_DEST_RGB;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_ViewportToLocal(void * jarg1, void * jarg2, float jarg3, float jarg4, float * jarg5, float * jarg6) {
+  bool jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::Actor arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float *arg5 = 0 ;
+  float *arg6 = 0 ;
+  Dali::Actor *argp2 ;
+  bool result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_ALPHA_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return 0;
+  }
+  arg2 = *argp2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg4;
+  arg5 = (float *)jarg5;
+  arg6 = (float *)jarg6;
+  {
+    try {
+      result = (bool)((Dali::RenderTask const *)arg1)->ViewportToLocal(arg2,arg3,arg4,*arg5,*arg6);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::Renderer::Property::BLEND_FACTOR_SRC_ALPHA;
-  jresult = (int)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_ALPHA_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Renderer::Property::BLEND_FACTOR_DEST_ALPHA;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FinishedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::RenderTask::RenderTaskSignalType *result = 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_COLOR_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::RenderTask *)jarg1;
+  {
+    try {
+      result = (Dali::RenderTask::RenderTaskSignalType *) &(arg1)->FinishedSignal();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::Renderer::Property::BLEND_COLOR;
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_PRE_MULTIPLIED_ALPHA_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_0(int jarg1, int jarg2, float jarg3, float jarg4) {
+  void * jresult ;
+  int arg1 ;
+  Dali::PointState::Type arg2 ;
+  float arg3 ;
+  float arg4 ;
+  Dali::TouchPoint *result = 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_FIRST_get() {
-  int jresult ;
-  int result;
+  arg1 = (int)jarg1;
+  arg2 = (Dali::PointState::Type)jarg2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg4;
+  {
+    try {
+      result = (Dali::TouchPoint *)new Dali::TouchPoint(arg1,arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::Renderer::Property::INDEX_RANGE_FIRST;
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_COUNT_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_1(int jarg1, int jarg2, float jarg3, float jarg4, float jarg5, float jarg6) {
+  void * jresult ;
+  int arg1 ;
+  Dali::PointState::Type arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  float arg6 ;
+  Dali::TouchPoint *result = 0 ;
 
-  result = (int)Dali::Renderer::Property::INDEX_RANGE_COUNT;
-  jresult = (int)result;
+  arg1 = (int)jarg1;
+  arg2 = (Dali::PointState::Type)jarg2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg4;
+  arg5 = (float)jarg5;
+  arg6 = (float)jarg6;
+  {
+    try {
+      result = (Dali::TouchPoint *)new Dali::TouchPoint(arg1,arg2,arg3,arg4,arg5,arg6);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_WRITE_MODE_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPoint(void * jarg1) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+
+  arg1 = (Dali::TouchPoint *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::Renderer::Property::DEPTH_WRITE_MODE;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_FUNCTION_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_set(void * jarg1, int jarg2) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  int arg2 ;
 
-  result = (int)Dali::Renderer::Property::DEPTH_FUNCTION;
-  jresult = (int)result;
-  return jresult;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->deviceId = arg2;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_TEST_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_get(void * jarg1) {
   int jresult ;
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   int result;
 
-  result = (int)Dali::Renderer::Property::DEPTH_TEST_MODE;
-  jresult = (int)result;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  result = (int) ((arg1)->deviceId);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_RENDER_MODE_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_state_set(void * jarg1, int jarg2) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::PointState::Type arg2 ;
 
-  result = (int)Dali::Renderer::Property::RENDER_MODE;
-  jresult = (int)result;
-  return jresult;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  arg2 = (Dali::PointState::Type)jarg2;
+  if (arg1) (arg1)->state = arg2;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_state_get(void * jarg1) {
   int jresult ;
-  int result;
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::PointState::Type result;
 
-  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  result = (Dali::PointState::Type) ((arg1)->state);
   jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_MASK_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_set(void * jarg1, void * jarg2) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Actor *arg2 = (Dali::Actor *) 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION_MASK;
-  jresult = (int)result;
-  return jresult;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
+  if (arg1) (arg1)->hitActor = *arg2;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_REFERENCE_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_get(void * jarg1) {
+  void * jresult ;
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Actor *result = 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_FUNCTION_REFERENCE;
-  jresult = (int)result;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  result = (Dali::Actor *)& ((arg1)->hitActor);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_MASK_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_local_set(void * jarg1, void * jarg2) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_MASK;
-  jresult = (int)result;
-  return jresult;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (arg1) (arg1)->local = *arg2;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_FAIL_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_local_get(void * jarg1) {
+  void * jresult ;
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Vector2 *result = 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_FAIL;
-  jresult = (int)result;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  result = (Dali::Vector2 *)& ((arg1)->local);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_FAIL_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_screen_set(void * jarg1, void * jarg2) {
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_FAIL;
-  jresult = (int)result;
-  return jresult;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (arg1) (arg1)->screen = *arg2;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_PASS_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_screen_get(void * jarg1) {
+  void * jresult ;
+  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
+  Dali::Vector2 *result = 0 ;
 
-  result = (int)Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_PASS;
-  jresult = (int)result;
+  arg1 = (Dali::TouchPoint *)jarg1;
+  result = (Dali::Vector2 *)& ((arg1)->screen);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Touch__SWIG_0() {
   void * jresult ;
-  Dali::Renderer::Property *result = 0 ;
+  Dali::TouchEvent *result = 0 ;
 
   {
     try {
-      result = (Dali::Renderer::Property *)new Dali::Renderer::Property();
+      result = (Dali::TouchEvent *)new Dali::TouchEvent();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -12333,10 +11659,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer_Property(void * jarg1) {
-  Dali::Renderer::Property *arg1 = (Dali::Renderer::Property *) 0 ;
 
-  arg1 = (Dali::Renderer::Property *)jarg1;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Touch(void * jarg1) {
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+
+  arg1 = (Dali::TouchEvent *)jarg1;
   {
     try {
       delete arg1;
@@ -12346,120 +11674,129 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_New(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Geometry *arg1 = 0 ;
-  Dali::Shader *arg2 = 0 ;
-  Dali::Renderer result;
 
-  arg1 = (Dali::Geometry *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Shader *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader & type is null", 0);
-    return 0;
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetTime(void * jarg1) {
+  unsigned long jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  unsigned long result;
+
+  arg1 = (Dali::TouchEvent *)jarg1;
+  {
+    try {
+      result = (unsigned long)((Dali::TouchEvent const *)arg1)->GetTime();
+    } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = (unsigned long)result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetPointCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t result;
+
+  arg1 = (Dali::TouchEvent *)jarg1;
   {
     try {
-      result = Dali::Renderer::New(*arg1,*arg2);
+      result = ((Dali::TouchEvent const *)arg1)->GetPointCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Renderer((const Dali::Renderer &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer__SWIG_0() {
-  void * jresult ;
-  Dali::Renderer *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceId(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  int32_t result;
 
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (Dali::Renderer *)new Dali::Renderer();
+      result = ((Dali::TouchEvent const *)arg1)->GetDeviceId(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer(void * jarg1) {
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetState(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::PointState::Type result;
 
-  arg1 = (Dali::Renderer *)jarg1;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::PointState::Type)((Dali::TouchEvent const *)arg1)->GetState(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetHitActor(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::Renderer *arg1 = 0 ;
-  Dali::Renderer *result = 0 ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Actor result;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Renderer const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (Dali::Renderer *)new Dali::Renderer((Dali::Renderer const &)*arg1);
+      result = ((Dali::TouchEvent const *)arg1)->GetHitActor(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Actor((const Dali::Actor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetLocalPosition(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Renderer result;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Vector2 *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = Dali::Renderer::DownCast(arg1);
+      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetLocalPosition(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Renderer((const Dali::Renderer &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetScreenPosition(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::Renderer *arg2 = 0 ;
-  Dali::Renderer *result = 0 ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Vector2 *result = 0 ;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  arg2 = (Dali::Renderer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Renderer const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (Dali::Renderer *) &(arg1)->operator =((Dali::Renderer const &)*arg2);
+      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetScreenPosition(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -12468,138 +11805,146 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetGeometry(void * jarg1, void * jarg2) {
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::Geometry *arg2 = 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetRadius(void * jarg1, unsigned long jarg2) {
+  float jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  float result;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  arg2 = (Dali::Geometry *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Geometry & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      (arg1)->SetGeometry(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (float)((Dali::TouchEvent const *)arg1)->GetRadius(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetGeometry(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetEllipseRadius(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::Geometry result;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Vector2 *result = 0 ;
 
-  arg1 = (Dali::Renderer *)jarg1;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = ((Dali::Renderer const *)arg1)->GetGeometry();
+      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetEllipseRadius(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Geometry((const Dali::Geometry &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetIndexRange(void * jarg1, int jarg2, int jarg3) {
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  int arg2 ;
-  int arg3 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetPressure(void * jarg1, unsigned long jarg2) {
+  float jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  float result;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      (arg1)->SetIndexRange(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (float)((Dali::TouchEvent const *)arg1)->GetPressure(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetTextures(void * jarg1, void * jarg2) {
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::TextureSet *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetAngle(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Degree result;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  arg2 = (Dali::TextureSet *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TextureSet & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      (arg1)->SetTextures(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::TouchEvent const *)arg1)->GetAngle(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Degree((const Dali::Degree &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetTextures(void * jarg1) {
-  void * jresult ;
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::TextureSet result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceClass(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Device::Class::Type result;
 
-  arg1 = (Dali::Renderer *)jarg1;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = ((Dali::Renderer const *)arg1)->GetTextures();
+      result = ((Dali::TouchEvent const *)arg1)->GetDeviceClass(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TextureSet((const Dali::TextureSet &)result);
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetShader(void * jarg1, void * jarg2) {
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::Shader *arg2 = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceSubclass(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Device::Subclass::Type result;
 
-  arg1 = (Dali::Renderer *)jarg1;
-  arg2 = (Dali::Shader *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Shader & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      (arg1)->SetShader(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::TouchEvent const *)arg1)->GetDeviceSubclass(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetShader(void * jarg1) {
-  void * jresult ;
-  Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
-  Dali::Shader result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetMouseButton(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::MouseButton::Type result;
 
-  arg1 = (Dali::Renderer *)jarg1;
+  arg1 = (Dali::TouchEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = ((Dali::Renderer const *)arg1)->GetShader();
+      result = ((Dali::TouchEvent const *)arg1)->GetMouseButton(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Shader((const Dali::Shader &)result);
+  jresult = static_cast< int >(result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer_Attachment() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_0() {
   void * jresult ;
-  Dali::FrameBuffer::Attachment *result = 0 ;
+  Dali::GestureDetector *result = 0 ;
 
   {
     try {
-      result = (Dali::FrameBuffer::Attachment *)new Dali::FrameBuffer::Attachment();
+      result = (Dali::GestureDetector *)new Dali::GestureDetector();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -12608,10 +11953,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer_Attachment() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer_Attachment(void * jarg1) {
-  Dali::FrameBuffer::Attachment *arg1 = (Dali::FrameBuffer::Attachment *) 0 ;
 
-  arg1 = (Dali::FrameBuffer::Attachment *)jarg1;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GestureDetector(void * jarg1) {
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+
+  arg1 = (Dali::GestureDetector *)jarg1;
   {
     try {
       delete arg1;
@@ -12621,34 +11968,42 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer_Attachment(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_New(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
-  unsigned int arg1 ;
-  unsigned int arg2 ;
-  unsigned int arg3 ;
-  Dali::FrameBuffer result;
+  Dali::GestureDetector *arg1 = 0 ;
+  Dali::GestureDetector *result = 0 ;
 
-  arg1 = (unsigned int)jarg1;
-  arg2 = (unsigned int)jarg2;
-  arg3 = (unsigned int)jarg3;
-  {
-    try {
-      result = Dali::FrameBuffer::New(arg1,arg2,static_cast<Dali::FrameBuffer::Attachment::Mask>(arg3));
+  arg1 = (Dali::GestureDetector *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::GestureDetector *)new Dali::GestureDetector((Dali::GestureDetector const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::FrameBuffer *result = 0 ;
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+  Dali::GestureDetector *arg2 = 0 ;
+  Dali::GestureDetector *result = 0 ;
 
+  arg1 = (Dali::GestureDetector *)jarg1;
+  arg2 = (Dali::GestureDetector *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::FrameBuffer *)new Dali::FrameBuffer();
+      result = (Dali::GestureDetector *) &(arg1)->operator =((Dali::GestureDetector const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -12657,210 +12012,212 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer(void * jarg1) {
-  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Attach(void * jarg1, void * jarg2) {
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::Actor *argp2 ;
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
+  arg1 = (Dali::GestureDetector *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      delete arg1;
+      (arg1)->Attach(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::FrameBuffer *arg1 = 0 ;
-  Dali::FrameBuffer *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Detach(void * jarg1, void * jarg2) {
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::Actor *argp2 ;
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::FrameBuffer const & type is null", 0);
-    return 0;
+  arg1 = (Dali::GestureDetector *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
   }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::FrameBuffer *)new Dali::FrameBuffer((Dali::FrameBuffer const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Detach(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::FrameBuffer result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_DetachAll(void * jarg1) {
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
+  arg1 = (Dali::GestureDetector *)jarg1;
+  {
+    try {
+      (arg1)->DetachAll();
+    } CALL_CATCH_EXCEPTION();
   }
-  arg1 = *argp1;
+
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActorCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+  size_t result;
+
+  arg1 = (Dali::GestureDetector *)jarg1;
   {
     try {
-      result = Dali::FrameBuffer::DownCast(arg1);
+      result = ((Dali::GestureDetector const *)arg1)->GetAttachedActorCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActor(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
-  Dali::FrameBuffer *arg2 = 0 ;
-  Dali::FrameBuffer *result = 0 ;
+  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
+  size_t arg2 ;
+  Dali::Actor result;
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
-  arg2 = (Dali::FrameBuffer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::FrameBuffer const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::GestureDetector *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      result = (Dali::FrameBuffer *) &(arg1)->operator =((Dali::FrameBuffer const &)*arg2);
+      result = ((Dali::GestureDetector const *)arg1)->GetAttachedActor(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Actor((const Dali::Actor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_0(void * jarg1, void * jarg2) {
-  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
-  Dali::Texture *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Gesture(void * jarg1) {
+  void * jresult ;
+  Dali::Gesture *arg1 = 0 ;
+  Dali::Gesture *result = 0 ;
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
-  arg2 = (Dali::Texture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture & type is null", 0);
-    return ;
+  arg1 = (Dali::Gesture *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Gesture const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->AttachColorTexture(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Gesture *)new Dali::Gesture((Dali::Gesture const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
-  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
-  Dali::Texture *arg2 = 0 ;
-  unsigned int arg3 ;
-  unsigned int arg4 ;
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
-  arg2 = (Dali::Texture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Texture & type is null", 0);
-    return ;
-  }
-  arg3 = (unsigned int)jarg3;
-  arg4 = (unsigned int)jarg4;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Gesture(void * jarg1) {
+  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
+
+  arg1 = (Dali::Gesture *)jarg1;
   {
     try {
-      (arg1)->AttachColorTexture(*arg2,arg3,arg4);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_type_get(void * jarg1) {
+  int jresult ;
+  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
+  Dali::GestureType::Value result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_GetColorTexture(void * jarg1) {
-  void * jresult ;
-  Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
-  Dali::Texture result;
+  arg1 = (Dali::Gesture *)jarg1;
+  result = (Dali::GestureType::Value) ((arg1)->GetType());
+  jresult = (int)result;
+  return jresult;
+}
 
-  arg1 = (Dali::FrameBuffer *)jarg1;
-  {
-    try {
-      result = (arg1)->GetColorTexture();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_state_get(void * jarg1) {
+  int jresult ;
+  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
+  Dali::GestureState result;
 
-  jresult = new Dali::Texture((const Dali::Texture &)result);
+  arg1 = (Dali::Gesture *)jarg1;
+  result = (Dali::GestureState) ((arg1)->GetState());
+  jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_FrameBuffer_GenerateUrl(void *jFrameBuffer, int pixelFormat, int width, int height)
-{
-  void *jresult;
-  Dali::Toolkit::ImageUrl result;
-  Dali::FrameBuffer *frameBuffer = (Dali::FrameBuffer*)jFrameBuffer;;
-
-  if (!frameBuffer)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::FrameBuffer is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Toolkit::Image::GenerateUrl((const Dali::FrameBuffer&)*frameBuffer, (Pixel::Format)pixelFormat, (uint32_t)width, (uint32_t)height);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Gesture_time_get(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
+  unsigned int result;
 
-  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl &)result);
+  arg1 = (Dali::Gesture *)jarg1;
+  result = (unsigned int) ((arg1)->GetTime());
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_sourceType_get(void * gesture) {
+  int jresult ;
+  Dali::Gesture *jGesture = (Dali::Gesture *) gesture;
+  Dali::GestureSourceType result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskList__SWIG_0() {
-  void * jresult ;
-  Dali::RenderTaskList *result = 0 ;
-
+  if (!jGesture) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Gesture const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::RenderTaskList *)new Dali::RenderTaskList();
+      result = (Dali::GestureSourceType)jGesture->GetSourceType();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::RenderTaskList result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_sourceData_get(void * gesture) {
+  int jresult ;
+  Dali::Gesture *jGesture = (Dali::Gesture *) gesture;
+  Dali::GestureSourceData result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  if (!jGesture) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::gesture const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::RenderTaskList::DownCast(arg1);
+      result = (Dali::GestureSourceData)jGesture->GetSourceData();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::RenderTaskList((const Dali::RenderTaskList &)result);
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskList(void * jarg1) {
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Hover(void * jarg1) {
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+
+  arg1 = (Dali::HoverEvent *)jarg1;
   {
     try {
       delete arg1;
@@ -12870,176 +12227,208 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskList(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskList__SWIG_1(void * jarg1) {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_New(unsigned int jarg1) {
   void * jresult ;
-  Dali::RenderTaskList *arg1 = 0 ;
-  Dali::RenderTaskList *result = 0 ;
+  unsigned int arg1 ;
+  Dali::HoverEvent result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTaskList const & type is null", 0);
-    return 0;
-  }
+  arg1 = (unsigned int)jarg1;
   {
     try {
-      result = (Dali::RenderTaskList *)new Dali::RenderTaskList((Dali::RenderTaskList const &)*arg1);
+      result = DevelHoverEvent::New(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::HoverEvent((const Dali::HoverEvent &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
-  Dali::RenderTaskList *arg2 = 0 ;
-  Dali::RenderTaskList *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Hover_GetTime(void * jarg1) {
+  unsigned long jresult ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  unsigned long result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
-  arg2 = (Dali::RenderTaskList *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTaskList const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::HoverEvent *)jarg1;
   {
     try {
-      result = (Dali::RenderTaskList *) &(arg1)->operator =((Dali::RenderTaskList const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      result = (unsigned long)((Dali::HoverEvent const *)arg1)->GetTime();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_CreateTask(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
-  Dali::RenderTask result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Hover_GetPointCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
+  arg1 = (Dali::HoverEvent *)jarg1;
   {
     try {
-      result = (arg1)->CreateTask();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::HoverEvent const *)arg1)->GetPointCount();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = new Dali::RenderTask((const Dali::RenderTask &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTaskList_RemoveTask(void * jarg1, void * jarg2) {
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
-  Dali::RenderTask arg2 ;
-  Dali::RenderTask *argp2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Hover_GetDeviceId(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t arg2 ;
+  int32_t result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
-  argp2 = (Dali::RenderTask *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::RenderTask", 0);
-    return ;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::HoverEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      (arg1)->RemoveTask(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::HoverEvent const *)arg1)->GetDeviceId(arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-//// ===============================================end part 1 =================
-
-//// ========================= part 2 ===============================
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTaskCount(void * jarg1) {
-  unsigned int jresult ;
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
-  unsigned int result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Hover_GetState(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::PointState::Type result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
+  arg1 = (Dali::HoverEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (unsigned int)((Dali::RenderTaskList const *)arg1)->GetTaskCount();
+      result = (Dali::PointState::Type)((Dali::HoverEvent const *)arg1)->GetState(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTask(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetHitActor(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
-  unsigned int arg2 ;
-  Dali::RenderTask result;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Actor result;
 
-  arg1 = (Dali::RenderTaskList *)jarg1;
-  arg2 = (unsigned int)jarg2;
+  arg1 = (Dali::HoverEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = ((Dali::RenderTaskList const *)arg1)->GetTask(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::HoverEvent const *)arg1)->GetHitActor(arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = new Dali::RenderTask((const Dali::RenderTask &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_POSITION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::RenderTask::Property::VIEWPORT_POSITION;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_SIZE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::RenderTask::Property::VIEWPORT_SIZE;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_CLEAR_COLOR_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::RenderTask::Property::CLEAR_COLOR;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_REQUIRES_SYNC_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::RenderTask::Property::REQUIRES_SYNC;
-  jresult = (int)result;
+  jresult = new Dali::Actor((const Dali::Actor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetLocalPosition(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::RenderTask::Property *result = 0 ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Vector2 *result = 0 ;
 
+  arg1 = (Dali::HoverEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      result = (Dali::RenderTask::Property *)new Dali::RenderTask::Property();
-    } CALL_CATCH_EXCEPTION(0);
+      result = (Dali::Vector2 *) &((Dali::HoverEvent const *)arg1)->GetLocalPosition(arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
   jresult = (void *)result;
@@ -13047,256 +12436,131 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTask_Property(void * jarg1) {
-  Dali::RenderTask::Property *arg1 = (Dali::RenderTask::Property *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetScreenPosition(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
+  std::size_t arg2 ;
+  Dali::Vector2 *result = 0 ;
 
-  arg1 = (Dali::RenderTask::Property *)jarg1;
+  arg1 = (Dali::HoverEvent *)jarg1;
+  arg2 = (std::size_t)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector2 *) &((Dali::HoverEvent const *)arg1)->GetScreenPosition(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION_get() {
-  void * jresult ;
-  bool (*result)(Dali::Vector2 &) = 0 ;
-
-  result = (bool (*)(Dali::Vector2 &))Dali::RenderTask::DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCTION_get() {
-  void * jresult ;
-  bool (*result)(Dali::Vector2 &) = 0 ;
-
-  result = (bool (*)(Dali::Vector2 &))Dali::RenderTask::FULLSCREEN_FRAMEBUFFER_FUNCTION;
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_EXCLUSIVE_get() {
-  bool jresult ;
-  bool result;
 
-  result = (bool)Dali::RenderTask::DEFAULT_EXCLUSIVE;
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_INPUT_ENABLED_get() {
-  bool jresult ;
-  bool result;
 
-  result = (bool)Dali::RenderTask::DEFAULT_INPUT_ENABLED;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_COLOR_get() {
-  void * jresult ;
-  Dali::Vector4 *result = 0 ;
-
-  result = (Dali::Vector4 *)&Dali::RenderTask::DEFAULT_CLEAR_COLOR;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_ENABLED_get() {
-  bool jresult ;
-  bool result;
-
-  result = (bool)Dali::RenderTask::DEFAULT_CLEAR_ENABLED;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CULL_MODE_get() {
-  bool jresult ;
-  bool result;
-
-  result = (bool)Dali::RenderTask::DEFAULT_CULL_MODE;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_REFRESH_RATE_get() {
-  unsigned int jresult ;
-  unsigned int result;
-
-  result = (unsigned int)(unsigned int)Dali::RenderTask::DEFAULT_REFRESH_RATE;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Key_New(char * jarg1, char * jarg2, int jarg3, int jarg4, unsigned long jarg5, int jarg6) {
   void * jresult ;
-  Dali::RenderTask *result = 0 ;
+  std::string *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;
+  unsigned long arg5 ;
+  Dali::KeyEvent::State *arg6 = 0 ;
+  Dali::KeyEvent::State temp6 ;
+  Dali::KeyEvent result;
 
-  {
-    try {
-      result = (Dali::RenderTask *)new Dali::RenderTask();
-    } CALL_CATCH_EXCEPTION(0);
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
   }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::RenderTask result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return 0;
   }
-  arg1 = *argp1;
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  arg3 = (int)jarg3;
+  arg4 = (int)jarg4;
+  arg5 = (unsigned long)jarg5;
+  temp6 = (Dali::KeyEvent::State)jarg6;
+  arg6 = &temp6;
   {
     try {
-      result = Dali::RenderTask::DownCast(arg1);
+      result = DevelKeyEvent::New((std::string const &)*arg1, "", (std::string const &)*arg2, arg3, arg4, arg5, (Dali::KeyEvent::State const &)*arg6, "", "", Device::Class::NONE, Device::Subclass::NONE);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::RenderTask((const Dali::RenderTask &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTask(void * jarg1) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
+  jresult = new Dali::KeyEvent((const Dali::KeyEvent &)result);
 
+  //argout typemap for const std::string&
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = 0 ;
-  Dali::RenderTask *result = 0 ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTask const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::RenderTask *)new Dali::RenderTask((Dali::RenderTask const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  //argout typemap for const std::string&
 
-  jresult = (void *)result;
   return jresult;
 }
 
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Key_New__SWIG_1()
+{
+  void* jresult;
+  Dali::KeyEvent result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::RenderTask *arg2 = 0 ;
-  Dali::RenderTask *result = 0 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = (Dali::RenderTask *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderTask const & type is null", 0);
-    return 0;
-  }
   {
-    try {
-      result = (Dali::RenderTask *) &(arg1)->operator =((Dali::RenderTask const &)*arg2);
+    try
+    {
+      result = DevelKeyEvent::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::KeyEvent((const Dali::KeyEvent &)result);
+
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Key(void * jarg1) {
+  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetSourceActor(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      (arg1)->SetSourceActor(arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetSourceActor(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Actor result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsShiftModifier(void * jarg1) {
+  bool jresult ;
+  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
+  bool result;
 
-  arg1 = (Dali::RenderTask *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = ((Dali::RenderTask const *)arg1)->GetSourceActor();
+      result = (bool)((Dali::KeyEvent const *)arg1)->IsShiftModifier();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Actor((const Dali::Actor &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetExclusive(void * jarg1, bool jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool arg2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try {
-      (arg1)->SetExclusive(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_IsExclusive(void * jarg1) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsCtrlModifier(void * jarg1) {
   bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   bool result;
 
-  arg1 = (Dali::RenderTask *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = (bool)((Dali::RenderTask const *)arg1)->IsExclusive();
+      result = (bool)((Dali::KeyEvent const *)arg1)->IsCtrlModifier();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -13305,30 +12569,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_IsExclusive(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetInputEnabled(void * jarg1, bool jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool arg2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try {
-      (arg1)->SetInputEnabled(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetInputEnabled(void * jarg1) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsAltModifier(void * jarg1) {
   bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
+  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   bool result;
 
-  arg1 = (Dali::RenderTask *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = (bool)((Dali::RenderTask const *)arg1)->GetInputEnabled();
+      result = (bool)((Dali::KeyEvent const *)arg1)->IsAltModifier();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -13337,5094 +12586,421 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetInputEnabled(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCameraActor(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::CameraActor arg2 ;
-  Dali::CameraActor *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressedName_set(void * jarg1, char * jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
+  std::string *arg2 = 0 ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::CameraActor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::CameraActor", 0);
+  argp1 = (Dali::KeyEvent *) jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
     return ;
   }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetCameraActor(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
+  Dali::KeyEvent arg1 = *argp1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCameraActor(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::CameraActor result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
   {
     try {
-      result = ((Dali::RenderTask const *)arg1)->GetCameraActor();
-    } CALL_CATCH_EXCEPTION(0);
+      Dali::DevelKeyEvent::SetKeyName(arg1, (std::string const &)*arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
   }
-
-  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetFrameBuffer(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::FrameBuffer arg2 ;
-  Dali::FrameBuffer *argp2 ;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressedName_get(void * jarg1) {
+  char * jresult ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::FrameBuffer *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::FrameBuffer", 0);
-    return ;
-  }
-  arg2 = *argp2;
+  if( jarg1 == NULL )
   {
-    try {
-      (arg1)->SetFrameBuffer(arg2);
-    } CALL_CATCH_EXCEPTION();
+    jresult = SWIG_csharp_string_callback( "" );
   }
+  else
+  {
+    Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+    std::string *result = 0;
+    std::string str = "";
 
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetFrameBuffer(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::FrameBuffer result;
+    arg1 = ( Dali::KeyEvent * )jarg1;
+    {
+      try {
+        str = ((Dali::KeyEvent const *)arg1)->GetKeyName();
+        result = (std::string *) &str;
+        jresult = SWIG_csharp_string_callback(result->c_str());
+      } catch (std::out_of_range& e) {
+        {
+          SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+        };
+      } catch (std::exception& e) {
+        {
+          SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+        };
+      } catch (Dali::DaliException e) {
+        {
+          SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+        };
+      } catch (...) {
+        {
+          SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+        };
+      }
+    }
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = ((Dali::RenderTask const *)arg1)->GetFrameBuffer();
-    } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferFunction(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::RenderTask::ScreenToFrameBufferFunction arg2 = (Dali::RenderTask::ScreenToFrameBufferFunction) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressed_set(void * jarg1, char * jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
+  std::string *arg2 = 0 ;
+
+  argp1 = (Dali::KeyEvent *) jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
+    return ;
+  }
+
+  Dali::KeyEvent arg1 = *argp1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = (Dali::RenderTask::ScreenToFrameBufferFunction)jarg2;
   {
     try {
-      (arg1)->SetScreenToFrameBufferFunction(arg2);
-    } CALL_CATCH_EXCEPTION();
+      Dali::DevelKeyEvent::SetKeyString(arg1, (std::string const &)*arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
   }
-
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferFunction(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::RenderTask::ScreenToFrameBufferFunction result;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressed_get(void * jarg1) {
+  char * jresult ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  std::string *result = 0;
+  std::string str = "";
+  arg1 = ( Dali::KeyEvent * )jarg1;
   {
     try {
-      result = (Dali::RenderTask::ScreenToFrameBufferFunction)((Dali::RenderTask const *)arg1)->GetScreenToFrameBufferFunction();
-    } CALL_CATCH_EXCEPTION(0);
+      str = ((Dali::KeyEvent const *)arg1)->GetKeyString();
+      result = (std::string *) &str;
+      jresult = SWIG_csharp_string_callback(result->c_str());
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferMappingActor(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyCode_set(void * jarg1, int jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+  argp1 = (Dali::KeyEvent *) jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
     return ;
   }
-  arg2 = *argp2;
+
+  Dali::KeyEvent arg1 = *argp1;
+  arg2 = (int)jarg2;
   {
     try {
-      (arg1)->SetScreenToFrameBufferMappingActor(arg2);
-    } CALL_CATCH_EXCEPTION();
+      Dali::DevelKeyEvent::SetKeyCode(arg1, arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
   }
-
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferMappingActor(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Actor result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyCode_get(void * jarg1) {
+  int jresult ;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  int result;
 
-  arg1 = (Dali::RenderTask *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = ((Dali::RenderTask const *)arg1)->GetScreenToFrameBufferMappingActor();
-    } CALL_CATCH_EXCEPTION(0);
+      result = (int)((Dali::KeyEvent const *)arg1)->GetKeyCode();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = new Dali::Actor((const Dali::Actor &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportPosition(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector2 arg2 ;
-  Dali::Vector2 *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyModifier_set(void * jarg1, int jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Vector2 *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+  argp1 = (Dali::KeyEvent *) jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
     return ;
   }
-  arg2 = *argp2;
+
+  Dali::KeyEvent arg1 = *argp1;
+  arg2 = (int)jarg2;
   {
     try {
-      (arg1)->SetViewportPosition(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportPosition(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = ((Dali::RenderTask const *)arg1)->GetCurrentViewportPosition();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportSize(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector2 arg2 ;
-  Dali::Vector2 *argp2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Vector2 *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetViewportSize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportSize(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = ((Dali::RenderTask const *)arg1)->GetCurrentViewportSize();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewport(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Viewport arg2 ;
-  Dali::Viewport *argp2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Viewport *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Viewport", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetViewport(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetViewport(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Viewport result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = ((Dali::RenderTask const *)arg1)->GetViewport();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Viewport((const Dali::Viewport &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearColor(void * jarg1, void * jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetClearColor((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetClearColor(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector4 result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = ((Dali::RenderTask const *)arg1)->GetClearColor();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearEnabled(void * jarg1, bool jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool arg2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try {
-      (arg1)->SetClearEnabled(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetClearEnabled(void * jarg1) {
-  bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::RenderTask const *)arg1)->GetClearEnabled();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCullMode(void * jarg1, bool jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool arg2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try {
-      (arg1)->SetCullMode(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_GetCullMode(void * jarg1) {
-  bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  bool result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::RenderTask const *)arg1)->GetCullMode();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetRefreshRate(void * jarg1, unsigned int jarg2) {
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      (arg1)->SetRefreshRate(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetRefreshRate(void * jarg1) {
-  unsigned int jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::RenderTask const *)arg1)->GetRefreshRate();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_WorldToViewport(void * jarg1, void * jarg2, float * jarg3, float * jarg4) {
-  bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  float *arg3 = 0 ;
-  float *arg4 = 0 ;
-  bool result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return 0;
-  }
-  arg3 = (float *)jarg3;
-  arg4 = (float *)jarg4;
-  {
-    try {
-      result = (bool)((Dali::RenderTask const *)arg1)->WorldToViewport((Dali::Vector3 const &)*arg2,*arg3,*arg4);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_RenderTask_ViewportToLocal(void * jarg1, void * jarg2, float jarg3, float jarg4, float * jarg5, float * jarg6) {
-  bool jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::Actor arg2 ;
-  float arg3 ;
-  float arg4 ;
-  float *arg5 = 0 ;
-  float *arg6 = 0 ;
-  Dali::Actor *argp2 ;
-  bool result;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
-  arg5 = (float *)jarg5;
-  arg6 = (float *)jarg6;
-  {
-    try {
-      result = (bool)((Dali::RenderTask const *)arg1)->ViewportToLocal(arg2,arg3,arg4,*arg5,*arg6);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FinishedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
-  Dali::RenderTask::RenderTaskSignalType *result = 0 ;
-
-  arg1 = (Dali::RenderTask *)jarg1;
-  {
-    try {
-      result = (Dali::RenderTask::RenderTaskSignalType *) &(arg1)->FinishedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_0(int jarg1, int jarg2, float jarg3, float jarg4) {
-  void * jresult ;
-  int arg1 ;
-  Dali::PointState::Type arg2 ;
-  float arg3 ;
-  float arg4 ;
-  Dali::TouchPoint *result = 0 ;
-
-  arg1 = (int)jarg1;
-  arg2 = (Dali::PointState::Type)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
-  {
-    try {
-      result = (Dali::TouchPoint *)new Dali::TouchPoint(arg1,arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_1(int jarg1, int jarg2, float jarg3, float jarg4, float jarg5, float jarg6) {
-  void * jresult ;
-  int arg1 ;
-  Dali::PointState::Type arg2 ;
-  float arg3 ;
-  float arg4 ;
-  float arg5 ;
-  float arg6 ;
-  Dali::TouchPoint *result = 0 ;
-
-  arg1 = (int)jarg1;
-  arg2 = (Dali::PointState::Type)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
-  arg5 = (float)jarg5;
-  arg6 = (float)jarg6;
-  {
-    try {
-      result = (Dali::TouchPoint *)new Dali::TouchPoint(arg1,arg2,arg3,arg4,arg5,arg6);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPoint(void * jarg1) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_set(void * jarg1, int jarg2) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  int arg2 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->deviceId = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_get(void * jarg1) {
-  int jresult ;
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  int result;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  result = (int) ((arg1)->deviceId);
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_state_set(void * jarg1, int jarg2) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::PointState::Type arg2 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  arg2 = (Dali::PointState::Type)jarg2;
-  if (arg1) (arg1)->state = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_state_get(void * jarg1) {
-  int jresult ;
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::PointState::Type result;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  result = (Dali::PointState::Type) ((arg1)->state);
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_set(void * jarg1, void * jarg2) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Actor *arg2 = (Dali::Actor *) 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (arg1) (arg1)->hitActor = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_get(void * jarg1) {
-  void * jresult ;
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Actor *result = 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  result = (Dali::Actor *)& ((arg1)->hitActor);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_local_set(void * jarg1, void * jarg2) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (arg1) (arg1)->local = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_local_get(void * jarg1) {
-  void * jresult ;
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  result = (Dali::Vector2 *)& ((arg1)->local);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_screen_set(void * jarg1, void * jarg2) {
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (arg1) (arg1)->screen = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_screen_get(void * jarg1) {
-  void * jresult ;
-  Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::TouchPoint *)jarg1;
-  result = (Dali::Vector2 *)& ((arg1)->screen);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Touch__SWIG_0() {
-  void * jresult ;
-  Dali::TouchEvent *result = 0 ;
-
-  {
-    try {
-      result = (Dali::TouchEvent *)new Dali::TouchEvent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Touch__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = 0 ;
-  Dali::TouchEvent *result = 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TouchEvent *)new Dali::TouchEvent((Dali::TouchEvent const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Touch(void * jarg1) {
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  Dali::TouchEvent *arg2 = 0 ;
-  Dali::TouchEvent *result = 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (Dali::TouchEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TouchEvent *) &(arg1)->operator =((Dali::TouchEvent const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetTime(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  unsigned long result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  {
-    try {
-      result = (unsigned long)((Dali::TouchEvent const *)arg1)->GetTime();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetPointCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetPointCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceId(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  int32_t result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetDeviceId(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetState(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::PointState::Type result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::PointState::Type)((Dali::TouchEvent const *)arg1)->GetState(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetHitActor(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Actor result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetHitActor(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Actor((const Dali::Actor &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetLocalPosition(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetLocalPosition(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetScreenPosition(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetScreenPosition(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetRadius(void * jarg1, unsigned long jarg2) {
-  float jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  float result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (float)((Dali::TouchEvent const *)arg1)->GetRadius(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetEllipseRadius(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::TouchEvent const *)arg1)->GetEllipseRadius(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetPressure(void * jarg1, unsigned long jarg2) {
-  float jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  float result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (float)((Dali::TouchEvent const *)arg1)->GetPressure(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetAngle(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Degree result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetAngle(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Degree((const Dali::Degree &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceClass(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Device::Class::Type result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetDeviceClass(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceSubclass(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Device::Subclass::Type result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetDeviceSubclass(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetMouseButton(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::MouseButton::Type result;
-
-  arg1 = (Dali::TouchEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::TouchEvent const *)arg1)->GetMouseButton(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = static_cast< int >(result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_0() {
-  void * jresult ;
-  Dali::GestureDetector *result = 0 ;
-
-  {
-    try {
-      result = (Dali::GestureDetector *)new Dali::GestureDetector();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::GestureDetector result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::GestureDetector::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::GestureDetector((const Dali::GestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GestureDetector(void * jarg1) {
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::GestureDetector *arg1 = 0 ;
-  Dali::GestureDetector *result = 0 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::GestureDetector *)new Dali::GestureDetector((Dali::GestureDetector const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-  Dali::GestureDetector *arg2 = 0 ;
-  Dali::GestureDetector *result = 0 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  arg2 = (Dali::GestureDetector *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::GestureDetector *) &(arg1)->operator =((Dali::GestureDetector const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Attach(void * jarg1, void * jarg2) {
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->Attach(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Detach(void * jarg1, void * jarg2) {
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->Detach(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_DetachAll(void * jarg1) {
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  {
-    try {
-      (arg1)->DetachAll();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActorCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  {
-    try {
-      result = ((Dali::GestureDetector const *)arg1)->GetAttachedActorCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActor(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
-  size_t arg2 ;
-  Dali::Actor result;
-
-  arg1 = (Dali::GestureDetector *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = ((Dali::GestureDetector const *)arg1)->GetAttachedActor(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Actor((const Dali::Actor &)result);
-  return jresult;
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GestureDetector_FeedTouch(void * jdetector, void * jactor, void * jtouch) {
-  bool result = false;
-  Dali::GestureDetector *detector = (Dali::GestureDetector *)jdetector;
-  Dali::Actor *actor = (Dali::Actor *)jactor;
-  Dali::TouchEvent *touchEvent = (Dali::TouchEvent *)jtouch;
-
-  {
-    try {
-      result = ((Dali::GestureDetector *)detector)->FeedTouch(*actor, *touchEvent);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return result;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Gesture(void * jarg1) {
-  void * jresult ;
-  Dali::Gesture *arg1 = 0 ;
-  Dali::Gesture *result = 0 ;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Gesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Gesture *)new Dali::Gesture((Dali::Gesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Gesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
-  Dali::Gesture *arg2 = 0 ;
-  Dali::Gesture *result = 0 ;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  arg2 = (Dali::Gesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Gesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Gesture *) &(arg1)->operator =((Dali::Gesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Gesture(void * jarg1) {
-  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_type_get(void * jarg1) {
-  int jresult ;
-  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
-  Dali::GestureType::Value result;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  result = (Dali::GestureType::Value) ((arg1)->GetType());
-  jresult = (int)result;
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_state_get(void * jarg1) {
-  int jresult ;
-  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
-  Dali::GestureState result;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  result = (Dali::GestureState) ((arg1)->GetState());
-  jresult = (int)result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Gesture_time_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::Gesture *)jarg1;
-  result = (unsigned int) ((arg1)->GetTime());
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_sourceType_get(void * gesture) {
-  int jresult ;
-  Dali::Gesture *jGesture = (Dali::Gesture *) gesture;
-  Dali::GestureSourceType result;
-
-  if (!jGesture) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Gesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::GestureSourceType)jGesture->GetSourceType();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_sourceData_get(void * gesture) {
-  int jresult ;
-  Dali::Gesture *jGesture = (Dali::Gesture *) gesture;
-  Dali::GestureSourceData result;
-
-  if (!jGesture) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::gesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::GestureSourceData)jGesture->GetSourceData();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Hover__SWIG_0() {
-  void * jresult ;
-  Dali::HoverEvent *result = 0 ;
-
-  {
-    try {
-      result = (Dali::HoverEvent *)new Dali::HoverEvent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Hover__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::HoverEvent *arg1 = 0 ;
-  Dali::HoverEvent *result = 0 ;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::HoverEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::HoverEvent *)new Dali::HoverEvent((Dali::HoverEvent const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Hover(void * jarg1) {
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  Dali::HoverEvent *arg2 = 0 ;
-  Dali::HoverEvent *result = 0 ;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (Dali::HoverEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::HoverEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::HoverEvent *) &(arg1)->operator =((Dali::HoverEvent const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_New(unsigned int jarg1) {
-  void * jresult ;
-  unsigned int arg1 ;
-  Dali::HoverEvent result;
-
-  arg1 = (unsigned int)jarg1;
-  {
-    try {
-      result = DevelHoverEvent::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::HoverEvent((const Dali::HoverEvent &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Hover_GetTime(void * jarg1) {
-  unsigned long jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  unsigned long result;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  {
-    try {
-      result = (unsigned long)((Dali::HoverEvent const *)arg1)->GetTime();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Hover_GetPointCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t result;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::HoverEvent const *)arg1)->GetPointCount();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Hover_GetDeviceId(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t arg2 ;
-  int32_t result;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::HoverEvent const *)arg1)->GetDeviceId(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Hover_GetState(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::PointState::Type result;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::PointState::Type)((Dali::HoverEvent const *)arg1)->GetState(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetHitActor(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Actor result;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = ((Dali::HoverEvent const *)arg1)->GetHitActor(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = new Dali::Actor((const Dali::Actor &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetLocalPosition(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::HoverEvent const *)arg1)->GetLocalPosition(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetScreenPosition(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
-  std::size_t arg2 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::HoverEvent *)jarg1;
-  arg2 = (std::size_t)jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::HoverEvent const *)arg1)->GetScreenPosition(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Key__SWIG_0() {
-  void * jresult ;
-  Dali::KeyEvent *result = 0 ;
-
-  {
-    try {
-      result = (Dali::KeyEvent *)new Dali::KeyEvent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Key__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::KeyEvent *arg1 = 0 ;
-  Dali::KeyEvent *result = 0 ;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::KeyEvent *)new Dali::KeyEvent((Dali::KeyEvent const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Key_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
-  Dali::KeyEvent *arg2 = 0 ;
-  Dali::KeyEvent *result = 0 ;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  arg2 = (Dali::KeyEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::KeyEvent *) &(arg1)->operator =((Dali::KeyEvent const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Key_New(char * jarg1, char * jarg2, int jarg3, int jarg4, unsigned long jarg5, int jarg6) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  int arg3 ;
-  int arg4 ;
-  unsigned long arg5 ;
-  Dali::KeyEvent::State *arg6 = 0 ;
-  Dali::KeyEvent::State temp6 ;
-  Dali::KeyEvent result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (int)jarg3;
-  arg4 = (int)jarg4;
-  arg5 = (unsigned long)jarg5;
-  temp6 = (Dali::KeyEvent::State)jarg6;
-  arg6 = &temp6;
-  {
-    try {
-      result = DevelKeyEvent::New((std::string const &)*arg1, "", (std::string const &)*arg2, arg3, arg4, arg5, (Dali::KeyEvent::State const &)*arg6, "", "", Device::Class::NONE, Device::Subclass::NONE);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::KeyEvent((const Dali::KeyEvent &)result);
-
-  //argout typemap for const std::string&
-
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Key_New__SWIG_1()
-{
-  void* jresult;
-  Dali::KeyEvent result;
-
-  {
-    try
-    {
-      result = DevelKeyEvent::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::KeyEvent((const Dali::KeyEvent &)result);
-
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Key(void * jarg1) {
-  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsShiftModifier(void * jarg1) {
-  bool jresult ;
-  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::KeyEvent const *)arg1)->IsShiftModifier();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsCtrlModifier(void * jarg1) {
-  bool jresult ;
-  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::KeyEvent const *)arg1)->IsCtrlModifier();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Key_IsAltModifier(void * jarg1) {
-  bool jresult ;
-  Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::KeyEvent const *)arg1)->IsAltModifier();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressedName_set(void * jarg1, char * jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
-  std::string *arg2 = 0 ;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-
-  {
-    try {
-      Dali::DevelKeyEvent::SetKeyName(arg1, (std::string const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressedName_get(void * jarg1) {
-  char * jresult ;
-
-  if( jarg1 == NULL )
-  {
-    jresult = SWIG_csharp_string_callback( "" );
-  }
-  else
-  {
-    Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-    std::string *result = 0;
-    std::string str = "";
-
-    arg1 = ( Dali::KeyEvent * )jarg1;
-    {
-      try {
-        str = ((Dali::KeyEvent const *)arg1)->GetKeyName();
-        result = (std::string *) &str;
-        jresult = SWIG_csharp_string_callback(result->c_str());
-      } catch (std::out_of_range& e) {
-        {
-          SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-        };
-      } catch (std::exception& e) {
-        {
-          SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-        };
-      } catch (Dali::DaliException e) {
-        {
-          SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-        };
-      } catch (...) {
-        {
-          SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-        };
-      }
-    }
-
-  }
-
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressed_set(void * jarg1, char * jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
-  std::string *arg2 = 0 ;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-
-  {
-    try {
-      Dali::DevelKeyEvent::SetKeyString(arg1, (std::string const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressed_get(void * jarg1) {
-  char * jresult ;
-
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  std::string *result = 0;
-  std::string str = "";
-  arg1 = ( Dali::KeyEvent * )jarg1;
-  {
-    try {
-      str = ((Dali::KeyEvent const *)arg1)->GetKeyString();
-      result = (std::string *) &str;
-      jresult = SWIG_csharp_string_callback(result->c_str());
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyCode_set(void * jarg1, int jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
-  int arg2 ;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  arg2 = (int)jarg2;
-  {
-    try {
-      Dali::DevelKeyEvent::SetKeyCode(arg1, arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyCode_get(void * jarg1) {
-  int jresult ;
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  int result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (int)((Dali::KeyEvent const *)arg1)->GetKeyCode();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyModifier_set(void * jarg1, int jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
-  int arg2 ;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  arg2 = (int)jarg2;
-  {
-    try {
-      Dali::DevelKeyEvent::SetKeyModifier(arg1, arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyModifier_get(void * jarg1) {
-  int jresult ;
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  int result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (int)((Dali::KeyEvent const *)arg1)->GetKeyModifier();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_time_set(void * jarg1, unsigned long jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
-  unsigned long arg2 ;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  arg2 = (int)jarg2;
-  {
-    try {
-      Dali::DevelKeyEvent::SetTime(arg1, arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Key_time_get(void * jarg1) {
-  unsigned long jresult ;
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  unsigned long result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (int)((Dali::KeyEvent const *)arg1)->GetTime();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_state_set(void * jarg1, int jarg2) {
-  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0;
-  Dali::KeyEvent::State arg2;
-
-  argp1 = (Dali::KeyEvent *) jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
-    return ;
-  }
-
-  Dali::KeyEvent arg1 = *argp1;
-  arg2 = (Dali::KeyEvent::State)jarg2;
-  {
-    try {
-      Dali::DevelKeyEvent::SetState(arg1, arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_state_get(void * jarg1) {
-  int jresult ;
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  Dali::KeyEvent::State result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  {
-    try {
-      result = (Dali::KeyEvent::State)((Dali::KeyEvent const *)arg1)->GetState();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (int)result;
-  return jresult;
-
-}
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_logicalKey_get(void * jarg1) {
-  char * jresult ;
-
-  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
-  std::string *result = 0;
-  std::string str = "";
-
-  arg1 = ( Dali::KeyEvent * )jarg1;
-  {
-    try {
-      str = ((Dali::KeyEvent const *)arg1)->GetLogicalKey();
-      result = (std::string *) &str;
-      jresult = SWIG_csharp_string_callback(result->c_str());
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetector__SWIG_0() {
-  void * jresult ;
-  Dali::LongPressGestureDetector *result = 0 ;
-
-  {
-    try {
-      result = (Dali::LongPressGestureDetector *)new Dali::LongPressGestureDetector();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_0() {
-  void * jresult ;
-  Dali::LongPressGestureDetector result;
-
-  {
-    try {
-      result = Dali::LongPressGestureDetector::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_1(unsigned int jarg1) {
-  void * jresult ;
-  unsigned int arg1 ;
-  Dali::LongPressGestureDetector result;
-
-  arg1 = (unsigned int)jarg1;
-  {
-    try {
-      result = Dali::LongPressGestureDetector::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
-  void * jresult ;
-  unsigned int arg1 ;
-  unsigned int arg2 ;
-  Dali::LongPressGestureDetector result;
-
-  arg1 = (unsigned int)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      result = Dali::LongPressGestureDetector::New(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::LongPressGestureDetector result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::LongPressGestureDetector::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetector(void * jarg1) {
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetector__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::LongPressGestureDetector *arg1 = 0 ;
-  Dali::LongPressGestureDetector *result = 0 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::LongPressGestureDetector *)new Dali::LongPressGestureDetector((Dali::LongPressGestureDetector const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  Dali::LongPressGestureDetector *arg2 = 0 ;
-  Dali::LongPressGestureDetector *result = 0 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  arg2 = (Dali::LongPressGestureDetector *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::LongPressGestureDetector *) &(arg1)->operator =((Dali::LongPressGestureDetector const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_0(void * jarg1, unsigned int jarg2) {
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      (arg1)->SetTouchesRequired(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  unsigned int arg2 ;
-  unsigned int arg3 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  arg3 = (unsigned int)jarg3;
-  {
-    try {
-      (arg1)->SetTouchesRequired(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::LongPressGestureDetector const *)arg1)->GetMinimumTouchesRequired();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::LongPressGestureDetector const *)arg1)->GetMaximumTouchesRequired();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_DetectedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
-  Dali::LongPressGestureDetector::DetectedSignalType *result = 0 ;
-
-  arg1 = (Dali::LongPressGestureDetector *)jarg1;
-  {
-    try {
-      result = (Dali::LongPressGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_0() {
-  void * jresult ;
-  Dali::LongPressGesture *result = 0 ;
-
-  {
-    try {
-      result = (Dali::LongPressGesture *)new Dali::LongPressGesture();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_New(int jarg1) {
-  void * jresult ;
-  Dali::GestureState arg1 ;
-  Dali::LongPressGesture result;
-
-  arg1 = (Dali::GestureState)jarg1;
-  {
-    try {
-      result = DevelLongPressGesture::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::LongPressGesture((const Dali::LongPressGesture &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::LongPressGesture *arg1 = 0 ;
-  Dali::LongPressGesture *result = 0 ;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::LongPressGesture *)new Dali::LongPressGesture((Dali::LongPressGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
-  Dali::LongPressGesture *arg2 = 0 ;
-  Dali::LongPressGesture *result = 0 ;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  arg2 = (Dali::LongPressGesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::LongPressGesture *) &(arg1)->operator =((Dali::LongPressGesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGesture(void * jarg1) {
-  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGesture_numberOfTouches_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  result = (unsigned int) ((arg1)->GetNumberOfTouches());
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_screenPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::LongPressGesture const *)arg1)->GetScreenPoint();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_localPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::LongPressGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::LongPressGesture const *)arg1)->GetLocalPoint();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Wheel__SWIG_0() {
-  void * jresult ;
-  Dali::WheelEvent *result = 0 ;
-
-  {
-    try {
-      result = (Dali::WheelEvent *)new Dali::WheelEvent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Wheel__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::WheelEvent *arg1 = 0 ;
-  Dali::WheelEvent *result = 0 ;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::WheelEvent *)new Dali::WheelEvent((Dali::WheelEvent const &)*arg1);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  Dali::WheelEvent *arg2 = 0 ;
-  Dali::WheelEvent *result = 0 ;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  arg2 = (Dali::WheelEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::WheelEvent *) &(arg1)->operator =((Dali::WheelEvent const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_New(int jarg1, int jarg2, unsigned int jarg3, void * jarg4, int jarg5, unsigned int jarg6) {
-  void * jresult ;
-  Dali::WheelEvent::Type arg1 ;
-  int arg2 ;
-  unsigned int arg3 ;
-  Dali::Vector2 arg4 ;
-  int arg5 ;
-  unsigned int arg6 ;
-  Dali::Vector2 *argp4 ;
-  Dali::WheelEvent result;
-
-  arg1 = (Dali::WheelEvent::Type)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (unsigned int)jarg3;
-  argp4 = (Dali::Vector2 *)jarg4;
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
-    return 0;
-  }
-  arg4 = *argp4;
-  arg5 = (int)jarg5;
-  arg6 = (unsigned int)jarg6;
-  {
-    try {
-      result = DevelWheelEvent::New(arg1,arg2,arg3,arg4,arg5,arg6);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::WheelEvent((const Dali::WheelEvent &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Wheel(void * jarg1) {
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsShiftModifier(void * jarg1) {
-  bool jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::WheelEvent const *)arg1)->IsShiftModifier();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsCtrlModifier(void * jarg1) {
-  bool jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::WheelEvent const *)arg1)->IsCtrlModifier();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsAltModifier(void * jarg1) {
-  bool jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  bool result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::WheelEvent const *)arg1)->IsAltModifier();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_type_get(void * jarg1) {
-  int jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  Dali::WheelEvent::Type result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::WheelEvent const *)arg1)->GetType();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_direction_get(void * jarg1) {
-  int jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  int result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::WheelEvent const *)arg1)->GetDirection();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_modifiers_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::WheelEvent const *)arg1)->GetModifiers();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_point_get(void * jarg1) {
-  void * jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = (Dali::Vector2 *) &((Dali::WheelEvent const *)arg1)->GetPoint();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_delta_get(void * jarg1) {
-  int jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  int result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::WheelEvent const *)arg1)->GetDelta();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_timeStamp_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::WheelEvent *)jarg1;
-  {
-    try {
-      result = ((Dali::WheelEvent const *)arg1)->GetTime();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetDeviceName(void * jarg1) {
-  char * jresult ;
-  Dali::KeyEvent *arg1 = 0 ;
-  std::string result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = arg1->GetDeviceName();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = SWIG_csharp_string_callback((&result)->c_str());
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetDeviceClass(void * jarg1) {
-  int jresult ;
-  Dali::KeyEvent *arg1 = 0 ;
-  Dali::Device::Class::Type result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Device::Class::Type)arg1->GetDeviceClass();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetDeviceSubClass(void * jarg1) {
-  int jresult ;
-  Dali::KeyEvent *arg1 = 0 ;
-  Dali::Device::Subclass::Type result;
-
-  arg1 = (Dali::KeyEvent *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Device::Subclass::Type)arg1->GetDeviceSubclass();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetCurrent() {
-  void * jresult ;
-  Dali::Stage result;
-
-  {
-    try {
-      result = Dali::Stage::GetCurrent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Stage((const Dali::Stage &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Stage_IsInstalled() {
-  bool jresult ;
-  bool result;
-
-  {
-    try {
-      result = (bool)Dali::Stage::IsInstalled();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetRenderTaskList(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::RenderTaskList result;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = ((Dali::Stage const *)arg1)->GetRenderTaskList();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::RenderTaskList((const Dali::RenderTaskList &)result);
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetDpi(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = ((Dali::Stage const *)arg1)->GetDpi();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_KeepRendering(void * jarg1, float jarg2) {
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->KeepRendering(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_KeyEventSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::KeyEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::KeyEventSignalType *) &(arg1)->KeyEventSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_EventProcessingFinishedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::EventProcessingFinishedSignalType *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::EventProcessingFinishedSignalType *) &(arg1)->EventProcessingFinishedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_TouchSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::TouchEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::TouchEventSignalType *) &(arg1)->TouchedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_WheelEventSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::WheelEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::WheelEventSignalType *) &(arg1)->WheelEventSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextLostSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::ContextStatusSignal *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::ContextStatusSignal *) &(arg1)->ContextLostSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextRegainedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::ContextStatusSignal *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::ContextStatusSignal *) &(arg1)->ContextRegainedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_SceneCreatedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::SceneCreatedSignalType *result = 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (Dali::Stage::SceneCreatedSignalType *) &(arg1)->SceneCreatedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_SetRenderingBehavior(void * jarg1, int jarg2) {
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::DevelStage::Rendering arg2 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  arg2 = (Dali::DevelStage::Rendering)jarg2;
-  {
-    try {
-      DevelStage::SetRenderingBehavior(*arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Stage_GetRenderingBehavior(void * jarg1) {
-
-  int jresult ;
-  int result ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-
-  arg1 = (Dali::Stage *)jarg1;
-  {
-    try {
-      result = (int)(DevelStage::GetRenderingBehavior(*arg1));
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RelayoutContainer(void * jarg1) {
-  Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
-
-  arg1 = (Dali::RelayoutContainer *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RelayoutContainer_Add(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
-  Dali::Actor *arg2 = 0 ;
-  Dali::Vector2 *arg3 = 0 ;
-
-  arg1 = (Dali::RelayoutContainer *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Vector2 *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->Add((Dali::Actor const &)*arg2,(Dali::Vector2 const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_Self(void * jarg1) {
-  void * jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::CustomActor result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  {
-    try {
-      result = ((Dali::CustomActorImpl const *)arg1)->Self();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::CustomActor((const Dali::CustomActor &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneConnection(void * jarg1, int jarg2) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  int arg2 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (int)jarg2;
-  {
-    try {
-      (arg1)->OnSceneConnection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneDisconnection(void * jarg1) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  {
-    try {
-      (arg1)->OnSceneDisconnection();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildAdd(void * jarg1, void * jarg2) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Actor *arg2 = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->OnChildAdd(*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildRemove(void * jarg1, void * jarg2) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Actor *arg2 = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->OnChildRemove(*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Property::Index arg2 ;
-  Dali::Property::Value arg3 ;
-  Dali::Property::Value *argp3 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Property::Index)jarg2;
-  argp3 = (Dali::Property::Value *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->OnPropertySet(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeSet(void * jarg1, void * jarg2) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->OnSizeSet((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Animation *arg2 = 0 ;
-  Dali::Vector3 *arg3 = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Animation *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Animation & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::Vector3 *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->OnSizeAnimation(*arg2,(Dali::Vector3 const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  Dali::RelayoutContainer *arg3 = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
-  }
-  arg3 = (Dali::RelayoutContainer *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RelayoutContainer & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->OnRelayout((Dali::Vector2 const &)*arg2,*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::ResizePolicy::Type arg2 ;
-  Dali::Dimension::Type arg3 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::ResizePolicy::Type)jarg2;
-  arg3 = (Dali::Dimension::Type)jarg3;
-  {
-    try {
-      (arg1)->OnSetResizePolicy(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetNaturalSize(void * jarg1) {
-  void * jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Vector3 result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  {
-    try {
-      result = (arg1)->GetNaturalSize();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
-  float jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Actor *arg2 = 0 ;
-  Dali::Dimension::Type arg3 ;
-  float result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
-    return 0;
-  }
-  arg3 = (Dali::Dimension::Type)jarg3;
-  {
-    try {
-      result = (float)(arg1)->CalculateChildSize((Dali::Actor const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetHeightForWidth(void * jarg1, float jarg2) {
-  float jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  float arg2 ;
-  float result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      result = (float)(arg1)->GetHeightForWidth(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetWidthForHeight(void * jarg1, float jarg2) {
-  float jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  float arg2 ;
-  float result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      result = (float)(arg1)->GetWidthForHeight(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
-  bool jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Dimension::Type arg2 ;
-  bool result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Dimension::Type)jarg2;
-  {
-    try {
-      result = (bool)(arg1)->RelayoutDependentOnChildren(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
-  bool jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  bool result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  {
-    try {
-      result = (bool)(arg1)->RelayoutDependentOnChildren();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  Dali::Dimension::Type arg2 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (Dali::Dimension::Type)jarg2;
-  {
-    try {
-      (arg1)->OnCalculateRelayoutSize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  float arg2 ;
-  Dali::Dimension::Type arg3 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (Dali::Dimension::Type)jarg3;
-  {
-    try {
-      (arg1)->OnLayoutNegotiated(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_IsRelayoutEnabled(void * jarg1) {
-  bool jresult ;
-  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
-  bool result;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::CustomActorImpl const *)arg1)->IsRelayoutEnabled();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_0() {
-  void * jresult ;
-  Dali::CustomActor *result = 0 ;
-
-  {
-    try {
-      result = (Dali::CustomActor *)new Dali::CustomActor();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::CustomActor result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::CustomActor::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::CustomActor((const Dali::CustomActor &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CustomActor(void * jarg1) {
-  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
-
-  arg1 = (Dali::CustomActor *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_GetImplementation(void * jarg1) {
-  void * jresult ;
-  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
-  Dali::CustomActorImpl *result = 0 ;
-
-  arg1 = (Dali::CustomActor *)jarg1;
-  {
-    try {
-      result = (Dali::CustomActorImpl *) &((Dali::CustomActor const *)arg1)->GetImplementation();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::CustomActorImpl *arg1 = 0 ;
-  Dali::CustomActor *result = 0 ;
-
-  arg1 = (Dali::CustomActorImpl *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActorImpl & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::CustomActor *)new Dali::CustomActor(*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_2(void * jarg1) {
-  void * jresult ;
-  Dali::CustomActor *arg1 = 0 ;
-  Dali::CustomActor *result = 0 ;
-
-  arg1 = (Dali::CustomActor *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActor const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::CustomActor *)new Dali::CustomActor((Dali::CustomActor const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
-  Dali::CustomActor *arg2 = 0 ;
-  Dali::CustomActor *result = 0 ;
-
-  arg1 = (Dali::CustomActor *)jarg1;
-  arg2 = (Dali::CustomActor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActor const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::CustomActor *) &(arg1)->operator =((Dali::CustomActor const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_POSITION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::SCREEN_POSITION;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_DISPLACEMENT_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::SCREEN_DISPLACEMENT;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_VELOCITY_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::SCREEN_VELOCITY;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_POSITION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::LOCAL_POSITION;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_DISPLACEMENT_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::LOCAL_DISPLACEMENT;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_VELOCITY_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::LOCAL_VELOCITY;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_PANNING_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PanGestureDetector::Property::PANNING;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector_Property() {
-  void * jresult ;
-  Dali::PanGestureDetector::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PanGestureDetector::Property *)new Dali::PanGestureDetector::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetector_Property(void * jarg1) {
-  Dali::PanGestureDetector::Property *arg1 = (Dali::PanGestureDetector::Property *) 0 ;
-
-  arg1 = (Dali::PanGestureDetector::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_LEFT_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_LEFT;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_RIGHT_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_RIGHT;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_UP_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_UP;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_DOWN_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_DOWN;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_HORIZONTAL_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_HORIZONTAL;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_VERTICAL_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_VERTICAL;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DEFAULT_THRESHOLD_get() {
-  void * jresult ;
-  Dali::Radian *result = 0 ;
-
-  result = (Dali::Radian *)&Dali::PanGestureDetector::DEFAULT_THRESHOLD;
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector__SWIG_0() {
-  void * jresult ;
-  Dali::PanGestureDetector *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PanGestureDetector *)new Dali::PanGestureDetector();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_New() {
-  void * jresult ;
-  Dali::PanGestureDetector result;
-
-  {
-    try {
-      result = Dali::PanGestureDetector::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PanGestureDetector((const Dali::PanGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::PanGestureDetector result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::PanGestureDetector::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PanGestureDetector((const Dali::PanGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetector(void * jarg1) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::PanGestureDetector *arg1 = 0 ;
-  Dali::PanGestureDetector *result = 0 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PanGestureDetector *)new Dali::PanGestureDetector((Dali::PanGestureDetector const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::PanGestureDetector *arg2 = 0 ;
-  Dali::PanGestureDetector *result = 0 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  arg2 = (Dali::PanGestureDetector *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PanGestureDetector *) &(arg1)->operator =((Dali::PanGestureDetector const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMinimumTouchesRequired(void * jarg1, unsigned int jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      (arg1)->SetMinimumTouchesRequired(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMaximumTouchesRequired(void * jarg1, unsigned int jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  {
-    try {
-      (arg1)->SetMaximumTouchesRequired(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMaximumMotionEventAge(void * jarg1, unsigned int jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  uint32_t arg2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  arg2 = (uint32_t)jarg2;
-  {
-    try {
-      (arg1)->SetMaximumMotionEventAge(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::PanGestureDetector const *)arg1)->GetMinimumTouchesRequired();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::PanGestureDetector const *)arg1)->GetMaximumTouchesRequired();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMaximumMotionEventAge(void * jarg1) {
-  unsigned int jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  uint32_t result;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      result = (uint32_t)((Dali::PanGestureDetector const *)arg1)->GetMaximumMotionEventAge();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian arg3 ;
-  Dali::Radian *argp2 ;
-  Dali::Radian *argp3 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  argp3 = (Dali::Radian *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->AddAngle(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_1(void * jarg1, void * jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->AddAngle(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian arg3 ;
-  Dali::Radian *argp2 ;
-  Dali::Radian *argp3 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  argp3 = (Dali::Radian *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->AddDirection(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_1(void * jarg1, void * jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->AddDirection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngleCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  size_t result;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGestureDetector const *)arg1)->GetAngleCount();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngle(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  size_t arg2 ;
-  Dali::PanGestureDetector::AngleThresholdPair result;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  arg2 = (size_t)jarg2;
-  {
-    try {
-      result = ((Dali::PanGestureDetector const *)arg1)->GetAngle(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PanGestureDetector::AngleThresholdPair((const Dali::PanGestureDetector::AngleThresholdPair &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_ClearAngles(void * jarg1) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      (arg1)->ClearAngles();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveAngle(void * jarg1, void * jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->RemoveAngle(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveDirection(void * jarg1, void * jarg2) {
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp2 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->RemoveDirection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DetectedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
-  Dali::PanGestureDetector::DetectedSignalType *result = 0 ;
-
-  arg1 = (Dali::PanGestureDetector *)jarg1;
-  {
-    try {
-      result = (Dali::PanGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetPanGestureProperties(void * jarg1) {
-  Dali::PanGesture *arg1 = 0 ;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      Dali::PanGestureDetector::SetPanGestureProperties((Dali::PanGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_0() {
-  void * jresult ;
-  Dali::PanGesture *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PanGesture *)new Dali::PanGesture();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_New(int jarg1) {
-  void * jresult ;
-  Dali::GestureState arg1 ;
-  Dali::PanGesture result;
-
-  arg1 = (Dali::GestureState)jarg1;
-  {
-    try {
-      result = DevelPanGesture::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PanGesture((const Dali::PanGesture &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_2(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = 0 ;
-  Dali::PanGesture *result = 0 ;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PanGesture *)new Dali::PanGesture((Dali::PanGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::PanGesture *arg2 = 0 ;
-  Dali::PanGesture *result = 0 ;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  arg2 = (Dali::PanGesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PanGesture *) &(arg1)->operator =((Dali::PanGesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGesture(void * jarg1) {
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_velocity_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetVelocity();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_displacement_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetDisplacement();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_position_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetPosition();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenVelocity_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetScreenVelocity();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenDisplacement_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetScreenDisplacement();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenPosition_get(void * jarg1) {
-  void * jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = ((Dali::PanGesture const *)arg1)->GetScreenPosition();
+      Dali::DevelKeyEvent::SetKeyModifier(arg1, arg2);
     } catch (std::out_of_range& e) {
       {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
       };
     } catch (std::exception& e) {
       {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
       };
     } catch (Dali::DaliException e) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
       };
     } catch (...) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
       };
     }
   }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGesture_numberOfTouches_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  result = (unsigned int) ((arg1)->GetNumberOfTouches());
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetSpeed(void * jarg1) {
-  float jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = (float)((Dali::PanGesture const *)arg1)->GetSpeed();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetDistance(void * jarg1) {
-  float jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = (float)((Dali::PanGesture const *)arg1)->GetDistance();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenSpeed(void * jarg1) {
-  float jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = (float)((Dali::PanGesture const *)arg1)->GetScreenSpeed();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenDistance(void * jarg1) {
-  float jresult ;
-  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PanGesture *)jarg1;
-  {
-    try {
-      result = (float)((Dali::PanGesture const *)arg1)->GetScreenDistance();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetector__SWIG_0() {
-  void * jresult ;
-  Dali::PinchGestureDetector *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PinchGestureDetector *)new Dali::PinchGestureDetector();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_New() {
-  void * jresult ;
-  Dali::PinchGestureDetector result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyModifier_get(void * jarg1) {
+  int jresult ;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  int result;
 
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = Dali::PinchGestureDetector::New();
-    } CALL_CATCH_EXCEPTION(0);
+      result = (int)((Dali::KeyEvent const *)arg1)->GetKeyModifier();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = new Dali::PinchGestureDetector((const Dali::PinchGestureDetector &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::PinchGestureDetector result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_time_set(void * jarg1, unsigned long jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ;
+  unsigned long arg2 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
+  argp1 = (Dali::KeyEvent *) jarg1;
   if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::PinchGestureDetector::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PinchGestureDetector((const Dali::PinchGestureDetector &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetector(void * jarg1) {
-  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
-
-  arg1 = (Dali::PinchGestureDetector *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetector__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::PinchGestureDetector *arg1 = 0 ;
-  Dali::PinchGestureDetector *result = 0 ;
-
-  arg1 = (Dali::PinchGestureDetector *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PinchGestureDetector *)new Dali::PinchGestureDetector((Dali::PinchGestureDetector const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
-  Dali::PinchGestureDetector *arg2 = 0 ;
-  Dali::PinchGestureDetector *result = 0 ;
-
-  arg1 = (Dali::PinchGestureDetector *)jarg1;
-  arg2 = (Dali::PinchGestureDetector *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGestureDetector const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PinchGestureDetector *) &(arg1)->operator =((Dali::PinchGestureDetector const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_DetectedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
-  Dali::PinchGestureDetector::DetectedSignalType *result = 0 ;
-
-  arg1 = (Dali::PinchGestureDetector *)jarg1;
-  {
-    try {
-      result = (Dali::PinchGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_0() {
-  void * jresult ;
-  Dali::PinchGesture *result = 0 ;
-
-  {
-    try {
-      result = (Dali::PinchGesture *)new Dali::PinchGesture();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_New(int jarg1) {
-  void * jresult ;
-  Dali::GestureState arg1 ;
-  Dali::PinchGesture result;
-
-  arg1 = (Dali::GestureState)jarg1;
-  {
-    try {
-      result = DevelPinchGesture::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PinchGesture((const Dali::PinchGesture &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::PinchGesture *arg1 = 0 ;
-  Dali::PinchGesture *result = 0 ;
-
-  arg1 = (Dali::PinchGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::PinchGesture *)new Dali::PinchGesture((Dali::PinchGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
+    return ;
   }
 
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
-  Dali::PinchGesture *arg2 = 0 ;
-  Dali::PinchGesture *result = 0 ;
-
-  arg1 = (Dali::PinchGesture *)jarg1;
-  arg2 = (Dali::PinchGesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGesture const & type is null", 0);
-    return 0;
-  }
+  Dali::KeyEvent arg1 = *argp1;
+  arg2 = (int)jarg2;
   {
     try {
-      result = (Dali::PinchGesture *) &(arg1)->operator =((Dali::PinchGesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      Dali::DevelKeyEvent::SetTime(arg1, arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
   }
-
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGesture(void * jarg1) {
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Key_time_get(void * jarg1) {
+  unsigned long jresult ;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  unsigned long result;
 
-  arg1 = (Dali::PinchGesture *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (int)((Dali::KeyEvent const *)arg1)->GetTime();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_scale_get(void * jarg1) {
-  float jresult ;
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PinchGesture *)jarg1;
-  result = (float) ((arg1)->GetScale());
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_speed_get(void * jarg1) {
-  float jresult ;
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
-  float result;
-
-  arg1 = (Dali::PinchGesture *)jarg1;
-  result = (float) ((arg1)->GetSpeed());
+
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_screenCenterPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
-  Dali::Vector2 result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_state_set(void * jarg1, int jarg2) {
+  Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0;
+  Dali::KeyEvent::State arg2;
 
-  arg1 = (Dali::PinchGesture *)jarg1;
+  argp1 = (Dali::KeyEvent *) jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0);
+    return ;
+  }
+
+  Dali::KeyEvent arg1 = *argp1;
+  arg2 = (Dali::KeyEvent::State)jarg2;
   {
     try {
-      result = ((Dali::PinchGesture const *)arg1)->GetScreenCenterPoint();
+      Dali::DevelKeyEvent::SetState(arg1, arg2);
     } catch (std::out_of_range& e) {
       {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
       };
     } catch (std::exception& e) {
       {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
       };
     } catch (Dali::DaliException e) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
       };
     } catch (...) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
       };
     }
   }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_localCenterPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
-  Dali::Vector2 result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_state_get(void * jarg1) {
+  int jresult ;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  Dali::KeyEvent::State result;
 
-  arg1 = (Dali::PinchGesture *)jarg1;
+  arg1 = (Dali::KeyEvent *)jarg1;
   {
     try {
-      result = ((Dali::PinchGesture const *)arg1)->GetLocalCenterPoint();
+      result = (Dali::KeyEvent::State)((Dali::KeyEvent const *)arg1)->GetState();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -18443,85 +13019,91 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_localCenterPoint_get(void
       };
     }
   }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+
+  jresult = (int)result;
   return jresult;
+
 }
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_logicalKey_get(void * jarg1) {
+  char * jresult ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_0() {
-  void * jresult ;
-  Dali::TapGestureDetector *result = 0 ;
+  Dali::KeyEvent *arg1 = ( Dali::KeyEvent * ) 0;
+  std::string *result = 0;
+  std::string str = "";
 
+  arg1 = ( Dali::KeyEvent * )jarg1;
   {
     try {
-      result = (Dali::TapGestureDetector *)new Dali::TapGestureDetector();
+      str = ((Dali::KeyEvent const *)arg1)->GetLogicalKey();
+      result = (std::string *) &str;
+      jresult = SWIG_csharp_string_callback(result->c_str());
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_0() {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_0() {
   void * jresult ;
-  Dali::TapGestureDetector result;
+  Dali::LongPressGestureDetector result;
 
   {
     try {
-      result = Dali::TapGestureDetector::New();
+      result = Dali::LongPressGestureDetector::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TapGestureDetector((const Dali::TapGestureDetector &)result);
+  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_1(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_1(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
-  Dali::TapGestureDetector result;
+  Dali::LongPressGestureDetector result;
 
   arg1 = (unsigned int)jarg1;
   {
     try {
-      result = Dali::TapGestureDetector::New(arg1);
+      result = Dali::LongPressGestureDetector::New(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TapGestureDetector((const Dali::TapGestureDetector &)result);
+  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::TapGestureDetector result;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  Dali::LongPressGestureDetector result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
+  arg1 = (unsigned int)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      result = Dali::TapGestureDetector::DownCast(arg1);
+      result = Dali::LongPressGestureDetector::New(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TapGestureDetector((const Dali::TapGestureDetector &)result);
+  jresult = new Dali::LongPressGestureDetector((const Dali::LongPressGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetector(void * jarg1) {
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetector(void * jarg1) {
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
+
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
   {
     try {
       delete arg1;
@@ -18531,19 +13113,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetector(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::TapGestureDetector *arg1 = 0 ;
-  Dali::TapGestureDetector *result = 0 ;
+  Dali::LongPressGestureDetector *arg1 = 0 ;
+  Dali::LongPressGestureDetector *result = 0 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGestureDetector const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGestureDetector const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::TapGestureDetector *)new Dali::TapGestureDetector((Dali::TapGestureDetector const &)*arg1);
+      result = (Dali::LongPressGestureDetector *)new Dali::LongPressGestureDetector((Dali::LongPressGestureDetector const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -18552,21 +13134,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
-  Dali::TapGestureDetector *arg2 = 0 ;
-  Dali::TapGestureDetector *result = 0 ;
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
+  Dali::LongPressGestureDetector *arg2 = 0 ;
+  Dali::LongPressGestureDetector *result = 0 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
-  arg2 = (Dali::TapGestureDetector *)jarg2;
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
+  arg2 = (Dali::LongPressGestureDetector *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGestureDetector const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGestureDetector const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::TapGestureDetector *) &(arg1)->operator =((Dali::TapGestureDetector const &)*arg2);
+      result = (Dali::LongPressGestureDetector *) &(arg1)->operator =((Dali::LongPressGestureDetector const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -18575,223 +13157,444 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_Assign(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMinimumTapsRequired(void * jarg1, unsigned int jarg2) {
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_0(void * jarg1, unsigned int jarg2) {
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int arg2 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
   arg2 = (unsigned int)jarg2;
   {
     try {
-      (arg1)->SetMinimumTapsRequired(arg2);
+      (arg1)->SetTouchesRequired(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMaximumTapsRequired(void * jarg1, unsigned int jarg2) {
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int arg2 ;
+  unsigned int arg3 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
   arg2 = (unsigned int)jarg2;
+  arg3 = (unsigned int)jarg3;
+  {
+    try {
+      (arg1)->SetTouchesRequired(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
+  unsigned int result;
+
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
+  {
+    try {
+      result = (unsigned int)((Dali::LongPressGestureDetector const *)arg1)->GetMinimumTouchesRequired();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
+  unsigned int result;
+
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
+  {
+    try {
+      result = (unsigned int)((Dali::LongPressGestureDetector const *)arg1)->GetMaximumTouchesRequired();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_DetectedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
+  Dali::LongPressGestureDetector::DetectedSignalType *result = 0 ;
+
+  arg1 = (Dali::LongPressGestureDetector *)jarg1;
+  {
+    try {
+      result = (Dali::LongPressGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_New(int jarg1) {
+  void * jresult ;
+  Dali::GestureState arg1 ;
+  Dali::LongPressGesture result;
+
+  arg1 = (Dali::GestureState)jarg1;
+  {
+    try {
+      result = DevelLongPressGesture::New(arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::LongPressGesture((const Dali::LongPressGesture &)result);
+  return jresult;
+}
+
+
+
+
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGesture(void * jarg1) {
+  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
+
+  arg1 = (Dali::LongPressGesture *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGesture_numberOfTouches_get(void * jarg1) {
+  unsigned int jresult ;
+  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
+  unsigned int result;
+
+  arg1 = (Dali::LongPressGesture *)jarg1;
+  result = (unsigned int) ((arg1)->GetNumberOfTouches());
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_screenPoint_get(void * jarg1) {
+  void * jresult ;
+  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
+  Dali::Vector2 result;
+
+  arg1 = (Dali::LongPressGesture *)jarg1;
   {
     try {
-      (arg1)->SetMaximumTapsRequired(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::LongPressGesture const *)arg1)->GetScreenPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMinimumTapsRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_localPoint_get(void * jarg1) {
+  void * jresult ;
+  Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg1 = (Dali::LongPressGesture *)jarg1;
   {
     try {
-      result = (unsigned int)((Dali::TapGestureDetector const *)arg1)->GetMinimumTapsRequired();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::LongPressGesture const *)arg1)->GetLocalPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-  jresult = result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMaximumTapsRequired(void * jarg1) {
-  unsigned int jresult ;
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
-  unsigned int result;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
-  {
-    try {
-      result = (unsigned int)((Dali::TapGestureDetector const *)arg1)->GetMaximumTapsRequired();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_ReceiveAllTapEvents(void * tapGestureDetector, bool isReceive) {
-  Dali::TapGestureDetector *detector = (Dali::TapGestureDetector *) 0 ;
 
-  detector = (Dali::TapGestureDetector *)tapGestureDetector;
-  if (!detector) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGestureDetector const & type is null", 0);
-    return;
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_New(int jarg1, int jarg2, unsigned int jarg3, void * jarg4, int jarg5, unsigned int jarg6) {
+  void * jresult ;
+  Dali::WheelEvent::Type arg1 ;
+  int arg2 ;
+  unsigned int arg3 ;
+  Dali::Vector2 arg4 ;
+  int arg5 ;
+  unsigned int arg6 ;
+  Dali::Vector2 *argp4 ;
+  Dali::WheelEvent result;
+
+  arg1 = (Dali::WheelEvent::Type)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (unsigned int)jarg3;
+  argp4 = (Dali::Vector2 *)jarg4;
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+    return 0;
   }
+  arg4 = *argp4;
+  arg5 = (int)jarg5;
+  arg6 = (unsigned int)jarg6;
   {
     try {
-      (detector)->ReceiveAllTapEvents(isReceive);
-    } CALL_CATCH_EXCEPTION();
+      result = DevelWheelEvent::New(arg1,arg2,arg3,arg4,arg5,arg6);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::WheelEvent((const Dali::WheelEvent &)result);
+  return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_DetectedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
-  Dali::TapGestureDetector::DetectedSignalType *result = 0 ;
 
-  arg1 = (Dali::TapGestureDetector *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Wheel(void * jarg1) {
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = (Dali::TapGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_0() {
-  void * jresult ;
-  Dali::TapGesture *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsShiftModifier(void * jarg1) {
+  bool jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  bool result;
 
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = (Dali::TapGesture *)new Dali::TapGesture();
+      result = (bool)((Dali::WheelEvent const *)arg1)->IsShiftModifier();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_New(int jarg1) {
-  void * jresult ;
-  Dali::GestureState arg1 ;
-  Dali::TapGesture result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsCtrlModifier(void * jarg1) {
+  bool jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  bool result;
 
-  arg1 = (Dali::GestureState)jarg1;
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = DevelTapGesture::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      result = (bool)((Dali::WheelEvent const *)arg1)->IsCtrlModifier();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = new Dali::TapGesture((const Dali::TapGesture &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::TapGesture *arg1 = 0 ;
-  Dali::TapGesture *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Wheel_IsAltModifier(void * jarg1) {
+  bool jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  bool result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGesture const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = (Dali::TapGesture *)new Dali::TapGesture((Dali::TapGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      result = (bool)((Dali::WheelEvent const *)arg1)->IsAltModifier();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
-  Dali::TapGesture *arg2 = 0 ;
-  Dali::TapGesture *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_type_get(void * jarg1) {
+  int jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  Dali::WheelEvent::Type result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
-  arg2 = (Dali::TapGesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGesture const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = (Dali::TapGesture *) &(arg1)->operator =((Dali::TapGesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::WheelEvent const *)arg1)->GetType();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
-  jresult = (void *)result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGesture(void * jarg1) {
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_direction_get(void * jarg1) {
+  int jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  int result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::WheelEvent const *)arg1)->GetDirection();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTaps_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_modifiers_get(void * jarg1) {
   unsigned int jresult ;
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   unsigned int result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
-  result = (unsigned int) ((arg1)->GetNumberOfTaps());
+  arg1 = (Dali::WheelEvent *)jarg1;
+  {
+    try {
+      result = ((Dali::WheelEvent const *)arg1)->GetModifiers();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = result;
   return jresult;
 }
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTouches_get(void * jarg1) {
-  unsigned int jresult ;
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
-  unsigned int result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
-  result = (unsigned int) ((arg1)->GetNumberOfTouches());
-  jresult = result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_point_get(void * jarg1) {
+  void * jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  Dali::Vector2 *result = 0 ;
+
+  arg1 = (Dali::WheelEvent *)jarg1;
+  {
+    try {
+      result = (Dali::Vector2 *) &((Dali::WheelEvent const *)arg1)->GetPoint();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_screenPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
-  Dali::Vector2 result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_delta_get(void * jarg1) {
+  int jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  int result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = ((Dali::TapGesture const *)arg1)->GetScreenPoint();
+      result = ((Dali::WheelEvent const *)arg1)->GetDelta();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -18810,20 +13613,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_screenPoint_get(void * jarg
       };
     }
   }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_localPoint_get(void * jarg1) {
-  void * jresult ;
-  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
-  Dali::Vector2 result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_timeStamp_get(void * jarg1) {
+  unsigned int jresult ;
+  Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::TapGesture *)jarg1;
+  arg1 = (Dali::WheelEvent *)jarg1;
   {
     try {
-      result = ((Dali::TapGesture const *)arg1)->GetLocalPoint();
+      result = ((Dali::WheelEvent const *)arg1)->GetTime();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -18842,79 +13646,147 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_localPoint_get(void * jarg1
       };
     }
   }
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetDeviceName(void * jarg1) {
+  char * jresult ;
+  Dali::KeyEvent *arg1 = 0 ;
+  std::string result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_0() {
-  void * jresult ;
-  Dali::AlphaFunction *result = 0 ;
-
+  arg1 = (Dali::KeyEvent *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::AlphaFunction *)new Dali::AlphaFunction();
+      result = arg1->GetDeviceName();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = SWIG_csharp_string_callback((&result)->c_str());
   return jresult;
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetDeviceClass(void * jarg1) {
+  int jresult ;
+  Dali::KeyEvent *arg1 = 0 ;
+  Dali::Device::Class::Type result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_1(int jarg1) {
-  void * jresult ;
-  Dali::AlphaFunction::BuiltinFunction arg1 ;
-  Dali::AlphaFunction *result = 0 ;
+  arg1 = (Dali::KeyEvent *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::Device::Class::Type)arg1->GetDeviceClass();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (Dali::AlphaFunction::BuiltinFunction)jarg1;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetDeviceSubClass(void * jarg1) {
+  int jresult ;
+  Dali::KeyEvent *arg1 = 0 ;
+  Dali::Device::Subclass::Type result;
+
+  arg1 = (Dali::KeyEvent *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::AlphaFunction *)new Dali::AlphaFunction(arg1);
+      result = (Dali::Device::Subclass::Type)arg1->GetDeviceSubclass();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetCurrent() {
   void * jresult ;
-  Dali::AlphaFunctionPrototype arg1 = (Dali::AlphaFunctionPrototype) 0 ;
-  Dali::AlphaFunction *result = 0 ;
+  Dali::Stage result;
 
-  arg1 = (Dali::AlphaFunctionPrototype)jarg1;
   {
     try {
-      result = (Dali::AlphaFunction *)new Dali::AlphaFunction(arg1);
+      result = Dali::Stage::GetCurrent();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Stage((const Dali::Stage &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Stage_IsInstalled() {
+  bool jresult ;
+  bool result;
+
+  {
+    try {
+      result = (bool)Dali::Stage::IsInstalled();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetRenderTaskList(void * jarg1) {
   void * jresult ;
-  Dali::Vector2 *arg1 = 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  Dali::AlphaFunction *result = 0 ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::RenderTaskList result;
 
-  arg1 = (Dali::Vector2 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
+  arg1 = (Dali::Stage *)jarg1;
+  {
+    try {
+      result = ((Dali::Stage const *)arg1)->GetRenderTaskList();
+    } CALL_CATCH_EXCEPTION(0);
   }
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
+
+  jresult = new Dali::RenderTaskList((const Dali::RenderTaskList &)result);
+  return jresult;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetDpi(void * jarg1) {
+  void * jresult ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Vector2 result;
+
+  arg1 = (Dali::Stage *)jarg1;
+  {
+    try {
+      result = ((Dali::Stage const *)arg1)->GetDpi();
+    } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
+}
+
+
+
+
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_EventProcessingFinishedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Stage::EventProcessingFinishedSignalType *result = 0 ;
+
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      result = (Dali::AlphaFunction *)new Dali::AlphaFunction((Dali::Vector2 const &)*arg1,(Dali::Vector2 const &)*arg2);
+      result = (Dali::Stage::EventProcessingFinishedSignalType *) &(arg1)->EventProcessingFinishedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -18923,32 +13795,34 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_3(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBezierControlPoints(void * jarg1) {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_WheelEventSignal(void * jarg1) {
   void * jresult ;
-  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
-  Dali::Vector4 result;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Stage::WheelEventSignalType *result = 0 ;
 
-  arg1 = (Dali::AlphaFunction *)jarg1;
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      result = ((Dali::AlphaFunction const *)arg1)->GetBezierControlPoints();
+      result = (Dali::Stage::WheelEventSignalType *) &(arg1)->WheelEventSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetCustomFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextLostSignal(void * jarg1) {
   void * jresult ;
-  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
-  Dali::AlphaFunctionPrototype result;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Stage::ContextStatusSignal *result = 0 ;
 
-  arg1 = (Dali::AlphaFunction *)jarg1;
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      result = (Dali::AlphaFunctionPrototype)((Dali::AlphaFunction const *)arg1)->GetCustomFunction();
+      result = (Dali::Stage::ContextStatusSignal *) &(arg1)->ContextLostSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -18957,188 +13831,199 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetCustomFunction(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBuiltinFunction(void * jarg1) {
-  int jresult ;
-  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
-  Dali::AlphaFunction::BuiltinFunction result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextRegainedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Stage::ContextStatusSignal *result = 0 ;
 
-  arg1 = (Dali::AlphaFunction *)jarg1;
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      result = (Dali::AlphaFunction::BuiltinFunction)((Dali::AlphaFunction const *)arg1)->GetBuiltinFunction();
+      result = (Dali::Stage::ContextStatusSignal *) &(arg1)->ContextRegainedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetMode(void * jarg1) {
-  int jresult ;
-  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
-  Dali::AlphaFunction::Mode result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_SceneCreatedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::Stage::SceneCreatedSignalType *result = 0 ;
 
-  arg1 = (Dali::AlphaFunction *)jarg1;
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      result = (Dali::AlphaFunction::Mode)((Dali::AlphaFunction const *)arg1)->GetMode();
+      result = (Dali::Stage::SceneCreatedSignalType *) &(arg1)->SceneCreatedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_SetRenderingBehavior(void * jarg1, int jarg2) {
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::DevelStage::Rendering arg2 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AlphaFunction(void * jarg1) {
-  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
+  arg1 = (Dali::Stage *)jarg1;
+  arg2 = (Dali::DevelStage::Rendering)jarg2;
+  {
+    try {
+      DevelStage::SetRenderingBehavior(*arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Stage_GetRenderingBehavior(void * jarg1) {
+
+  int jresult ;
+  int result ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
 
-  arg1 = (Dali::AlphaFunction *)jarg1;
+  arg1 = (Dali::Stage *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (int)(DevelStage::GetRenderingBehavior(*arg1));
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RelayoutContainer(void * jarg1) {
+  Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_New() {
-  void * jresult ;
-  Dali::KeyFrames result;
-
+  arg1 = (Dali::RelayoutContainer *)jarg1;
   {
     try {
-      result = Dali::KeyFrames::New();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::KeyFrames((const Dali::KeyFrames &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::KeyFrames result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RelayoutContainer_Add(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
+  Dali::Actor *arg2 = 0 ;
+  Dali::Vector2 *arg3 = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
+  arg1 = (Dali::RelayoutContainer *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Vector2 *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::KeyFrames::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Add((Dali::Actor const &)*arg2,(Dali::Vector2 const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::KeyFrames((const Dali::KeyFrames &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyFrames__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_Self(void * jarg1) {
   void * jresult ;
-  Dali::KeyFrames *result = 0 ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::CustomActor result;
 
+  arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      result = (Dali::KeyFrames *)new Dali::KeyFrames();
+      result = ((Dali::CustomActorImpl const *)arg1)->Self();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::CustomActor((const Dali::CustomActor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyFrames(void * jarg1) {
-  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneConnection(void * jarg1, int jarg2) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->OnSceneConnection(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyFrames__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::KeyFrames *arg1 = 0 ;
-  Dali::KeyFrames *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneDisconnection(void * jarg1) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyFrames const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      result = (Dali::KeyFrames *)new Dali::KeyFrames((Dali::KeyFrames const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->OnSceneDisconnection();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
-  Dali::KeyFrames *arg2 = 0 ;
-  Dali::KeyFrames *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildAdd(void * jarg1, void * jarg2) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Actor *arg2 = 0 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
-  arg2 = (Dali::KeyFrames *)jarg2;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyFrames const & type is null", 0);
-    return 0;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::KeyFrames *) &(arg1)->operator =((Dali::KeyFrames const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->OnChildAdd(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_KeyFrames_GetType(void * jarg1) {
-  int jresult ;
-  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
-  Dali::Property::Type result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildRemove(void * jarg1, void * jarg2) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Actor *arg2 = 0 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (Dali::Property::Type)((Dali::KeyFrames const *)arg1)->GetType();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->OnChildRemove(*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_0(void * jarg1, float jarg2, void * jarg3) {
-  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
-  float arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Property::Index arg2 ;
   Dali::Property::Value arg3 ;
   Dali::Property::Value *argp3 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Property::Index)jarg2;
   argp3 = (Dali::Property::Value *)jarg3;
   if (!argp3) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
@@ -19147,344 +14032,313 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_0(void * jarg1, floa
   arg3 = *argp3;
   {
     try {
-      (arg1)->Add(arg2,arg3);
+      (arg1)->OnPropertySet(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_1(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
-  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
-  float arg2 ;
-  Dali::Property::Value arg3 ;
-  Dali::AlphaFunction arg4 ;
-  Dali::Property::Value *argp3 ;
-  Dali::AlphaFunction *argp4 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeSet(void * jarg1, void * jarg2) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (Dali::KeyFrames *)jarg1;
-  arg2 = (float)jarg2;
-  argp3 = (Dali::Property::Value *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  argp4 = (Dali::AlphaFunction *)jarg4;
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::AlphaFunction", 0);
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return ;
   }
-  arg4 = *argp4;
   {
     try {
-      (arg1)->Add(arg2,arg3,arg4);
+      (arg1)->OnSizeSet((Dali::Vector3 const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_KeyFrames_GetKeyFrameCount(void* keyFrames)
-{
-  unsigned int jresult;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Animation *arg2 = 0 ;
+  Dali::Vector3 *arg3 = 0 ;
+
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Animation *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Animation & type is null", 0);
+    return ;
+  }
+  arg3 = (Dali::Vector3 *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      jresult = Dali::DevelKeyFrames::GetKeyFrameCount(*((Dali::KeyFrames*)keyFrames));
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->OnSizeAnimation(*arg2,(Dali::Vector3 const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
-  return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_GetKeyFrame(void* keyFrames, unsigned int index, float* time, void* value)
-{
-  if (!value) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Vector2 *arg2 = 0 ;
+  Dali::RelayoutContainer *arg3 = 0 ;
+
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
     return ;
   }
-  try {
-    Dali::DevelKeyFrames::GetKeyFrame(*((Dali::KeyFrames*)keyFrames), (size_t)index, *time, *((Property::Value*)value));
-  } CALL_CATCH_EXCEPTION();
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_SetKeyFrameValue(void* keyFrames, unsigned int index, void* value)
-{
-  if (!value) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
+  arg3 = (Dali::RelayoutContainer *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RelayoutContainer & type is null", 0);
     return ;
   }
-  try {
-    Dali::DevelKeyFrames::SetKeyFrameValue(*((Dali::KeyFrames*)keyFrames), (size_t)index, *((const Property::Value*)value));
-  } CALL_CATCH_EXCEPTION();
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_POINTS_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Path::Property::POINTS;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_CONTROL_POINTS_get() {
-  int jresult ;
-  int result;
+  {
+    try {
+      (arg1)->OnRelayout((Dali::Vector2 const &)*arg2,*arg3);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::Path::Property::CONTROL_POINTS;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path_Property() {
-  void * jresult ;
-  Dali::Path::Property *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::ResizePolicy::Type arg2 ;
+  Dali::Dimension::Type arg3 ;
 
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::ResizePolicy::Type)jarg2;
+  arg3 = (Dali::Dimension::Type)jarg3;
   {
     try {
-      result = (Dali::Path::Property *)new Dali::Path::Property();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->OnSetResizePolicy(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Path_Property(void * jarg1) {
-  Dali::Path::Property *arg1 = (Dali::Path::Property *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetNaturalSize(void * jarg1) {
+  void * jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Vector3 result;
 
-  arg1 = (Dali::Path::Property *)jarg1;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->GetNaturalSize();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  return jresult;
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_New() {
-  void * jresult ;
-  Dali::Path result;
-
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GestureDetector_FeedTouch(void * jdetector, void * jactor, void * jtouch) {
+  bool result = false;
+  Dali::GestureDetector *detector = (Dali::GestureDetector *)jdetector;
+  Dali::Actor *actor = (Dali::Actor *)jactor;
+  Dali::TouchEvent *touchEvent = (Dali::TouchEvent *)jtouch;
+
   {
     try {
-      result = Dali::Path::New();
+      result = ((Dali::GestureDetector *)detector)->FeedTouch(*actor, *touchEvent);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Path((const Dali::Path &)result);
-  return jresult;
+  return result;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Path result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
+  float jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Actor *arg2 = 0 ;
+  Dali::Dimension::Type arg3 ;
+  float result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
+  arg3 = (Dali::Dimension::Type)jarg3;
   {
     try {
-      result = Dali::Path::DownCast(arg1);
+      result = (float)(arg1)->CalculateChildSize((Dali::Actor const &)*arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Path((const Dali::Path &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path__SWIG_0() {
-  void * jresult ;
-  Dali::Path *result = 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetHeightForWidth(void * jarg1, float jarg2) {
+  float jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  float arg2 ;
+  float result;
 
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      result = (Dali::Path *)new Dali::Path();
+      result = (float)(arg1)->GetHeightForWidth(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Path(void * jarg1) {
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetWidthForHeight(void * jarg1, float jarg2) {
+  float jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  float arg2 ;
+  float result;
 
-  arg1 = (Dali::Path *)jarg1;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (float)(arg1)->GetWidthForHeight(arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Path *arg1 = 0 ;
-  Dali::Path *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
+  bool jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Dimension::Type arg2 ;
+  bool result;
 
-  arg1 = (Dali::Path *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Path const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Dimension::Type)jarg2;
   {
     try {
-      result = (Dali::Path *)new Dali::Path((Dali::Path const &)*arg1);
+      result = (bool)(arg1)->RelayoutDependentOnChildren(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  Dali::Path *arg2 = 0 ;
-  Dali::Path *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
+  bool jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (Dali::Path *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Path const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      result = (Dali::Path *) &(arg1)->operator =((Dali::Path const &)*arg2);
+      result = (bool)(arg1)->RelayoutDependentOnChildren();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddPoint(void * jarg1, void * jarg2) {
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  Dali::Dimension::Type arg2 ;
 
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (Dali::Dimension::Type)jarg2;
   {
     try {
-      (arg1)->AddPoint((Dali::Vector3 const &)*arg2);
+      (arg1)->OnCalculateRelayoutSize(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddControlPoint(void * jarg1, void * jarg2) {
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  float arg2 ;
+  Dali::Dimension::Type arg3 ;
 
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (Dali::Dimension::Type)jarg3;
   {
     try {
-      (arg1)->AddControlPoint((Dali::Vector3 const &)*arg2);
+      (arg1)->OnLayoutNegotiated(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CustomActorImpl_IsRelayoutEnabled(void * jarg1) {
+  bool jresult ;
+  Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
+  bool result;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_GenerateControlPoints(void * jarg1, float jarg2) {
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      (arg1)->GenerateControlPoints(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::CustomActorImpl const *)arg1)->IsRelayoutEnabled();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_0() {
+  void * jresult ;
+  Dali::CustomActor *result = 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_Sample(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  float arg2 ;
-  Dali::Vector3 *arg3 = 0 ;
-  Dali::Vector3 *arg4 = 0 ;
-
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (Dali::Vector3 *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
-  arg4 = (Dali::Vector3 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
   {
     try {
-      ((Dali::Path const *)arg1)->Sample(arg2,*arg3,*arg4);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::CustomActor *)new Dali::CustomActor();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetPoint(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  size_t arg2 ;
-  Dali::Vector3 *result = 0 ;
 
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (size_t)jarg2;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CustomActor(void * jarg1) {
+  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
+
+  arg1 = (Dali::CustomActor *)jarg1;
   {
     try {
-      result = (Dali::Vector3 *) &(arg1)->GetPoint(arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetControlPoint(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_GetImplementation(void * jarg1) {
   void * jresult ;
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  size_t arg2 ;
-  Dali::Vector3 *result = 0 ;
+  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
+  Dali::CustomActorImpl *result = 0 ;
 
-  arg1 = (Dali::Path *)jarg1;
-  arg2 = (size_t)jarg2;
+  arg1 = (Dali::CustomActor *)jarg1;
   {
     try {
-      result = (Dali::Vector3 *) &(arg1)->GetControlPoint(arg2);
+      result = (Dali::CustomActorImpl *) &((Dali::CustomActor const *)arg1)->GetImplementation();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -19493,32 +14347,40 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetControlPoint(void * jarg1, uns
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Path_GetPointCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Path *arg1 = (Dali::Path *) 0 ;
-  size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::CustomActorImpl *arg1 = 0 ;
+  Dali::CustomActor *result = 0 ;
 
-  arg1 = (Dali::Path *)jarg1;
+  arg1 = (Dali::CustomActorImpl *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActorImpl & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = ((Dali::Path const *)arg1)->GetPointCount();
+      result = (Dali::CustomActor *)new Dali::CustomActor(*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_0(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_2(void * jarg1) {
   void * jresult ;
-  float arg1 ;
-  Dali::TimePeriod *result = 0 ;
+  Dali::CustomActor *arg1 = 0 ;
+  Dali::CustomActor *result = 0 ;
 
-  arg1 = (float)jarg1;
+  arg1 = (Dali::CustomActor *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActor const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::TimePeriod *)new Dali::TimePeriod(arg1);
+      result = (Dali::CustomActor *)new Dali::CustomActor((Dali::CustomActor const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -19527,17 +14389,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_0(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_1(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  Dali::TimePeriod *result = 0 ;
+  Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
+  Dali::CustomActor *arg2 = 0 ;
+  Dali::CustomActor *result = 0 ;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::CustomActor *)jarg1;
+  arg2 = (Dali::CustomActor *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CustomActor const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::TimePeriod *)new Dali::TimePeriod(arg1,arg2);
+      result = (Dali::CustomActor *) &(arg1)->operator =((Dali::CustomActor const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -19546,167 +14412,171 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_1(float jarg1, fl
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimePeriod(void * jarg1) {
-  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
-
-  arg1 = (Dali::TimePeriod *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_POSITION_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::PanGestureDetector::Property::SCREEN_POSITION;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_set(void * jarg1, float jarg2) {
-  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
-  float arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_DISPLACEMENT_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::TimePeriod *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->delaySeconds = arg2;
+  result = (int)Dali::PanGestureDetector::Property::SCREEN_DISPLACEMENT;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_get(void * jarg1) {
-  float jresult ;
-  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
-  float result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_VELOCITY_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::TimePeriod *)jarg1;
-  result = (float) ((arg1)->delaySeconds);
-  jresult = result;
+  result = (int)Dali::PanGestureDetector::Property::SCREEN_VELOCITY;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_set(void * jarg1, float jarg2) {
-  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
-  float arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_POSITION_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::TimePeriod *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->durationSeconds = arg2;
+  result = (int)Dali::PanGestureDetector::Property::LOCAL_POSITION;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_get(void * jarg1) {
-  float jresult ;
-  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
-  float result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_DISPLACEMENT_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::TimePeriod *)jarg1;
-  result = (float) ((arg1)->durationSeconds);
-  jresult = result;
+  result = (int)Dali::PanGestureDetector::Property::LOCAL_DISPLACEMENT;
+  jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_VALUE_get() {
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_VELOCITY_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::LinearConstrainer::Property::VALUE;
+  result = (int)Dali::PanGestureDetector::Property::LOCAL_VELOCITY;
   jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_PROGRESS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_PANNING_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::LinearConstrainer::Property::PROGRESS;
+  result = (int)Dali::PanGestureDetector::Property::PANNING;
   jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer_Property() {
-  void * jresult ;
-  Dali::LinearConstrainer::Property *result = 0 ;
 
-  {
-    try {
-      result = (Dali::LinearConstrainer::Property *)new Dali::LinearConstrainer::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_LEFT_get() {
+  void * jresult ;
+  Dali::Radian *result = 0 ;
+
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_LEFT;
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer_Property(void * jarg1) {
-  Dali::LinearConstrainer::Property *arg1 = (Dali::LinearConstrainer::Property *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_RIGHT_get() {
+  void * jresult ;
+  Dali::Radian *result = 0 ;
 
-  arg1 = (Dali::LinearConstrainer::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_RIGHT;
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_UP_get() {
+  void * jresult ;
+  Dali::Radian *result = 0 ;
 
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_UP;
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_DOWN_get() {
   void * jresult ;
-  Dali::LinearConstrainer result;
+  Dali::Radian *result = 0 ;
 
-  {
-    try {
-      result = Dali::LinearConstrainer::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_DOWN;
+  jresult = (void *)result;
+  return jresult;
+}
 
-  jresult = new Dali::LinearConstrainer((const Dali::LinearConstrainer &)result);
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_HORIZONTAL_get() {
+  void * jresult ;
+  Dali::Radian *result = 0 ;
+
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_HORIZONTAL;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_VERTICAL_get() {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::LinearConstrainer result;
+  Dali::Radian *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::LinearConstrainer::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DIRECTION_VERTICAL;
+  jresult = (void *)result;
+  return jresult;
+}
 
-  jresult = new Dali::LinearConstrainer((const Dali::LinearConstrainer &)result);
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DEFAULT_THRESHOLD_get() {
+  void * jresult ;
+  Dali::Radian *result = 0 ;
+
+  result = (Dali::Radian *)&Dali::PanGestureDetector::DEFAULT_THRESHOLD;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer__SWIG_0() {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_New() {
   void * jresult ;
-  Dali::LinearConstrainer *result = 0 ;
+  Dali::PanGestureDetector result;
 
   {
     try {
-      result = (Dali::LinearConstrainer *)new Dali::LinearConstrainer();
+      result = Dali::PanGestureDetector::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PanGestureDetector((const Dali::PanGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer(void * jarg1) {
-  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetector(void * jarg1) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
       delete arg1;
@@ -19716,19 +14586,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::LinearConstrainer *arg1 = 0 ;
-  Dali::LinearConstrainer *result = 0 ;
+  Dali::PanGestureDetector *arg1 = 0 ;
+  Dali::PanGestureDetector *result = 0 ;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LinearConstrainer const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGestureDetector const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::LinearConstrainer *)new Dali::LinearConstrainer((Dali::LinearConstrainer const &)*arg1);
+      result = (Dali::PanGestureDetector *)new Dali::PanGestureDetector((Dali::PanGestureDetector const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -19737,21 +14607,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
-  Dali::LinearConstrainer *arg2 = 0 ;
-  Dali::LinearConstrainer *result = 0 ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::PanGestureDetector *arg2 = 0 ;
+  Dali::PanGestureDetector *result = 0 ;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
-  arg2 = (Dali::LinearConstrainer *)jarg2;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  arg2 = (Dali::PanGestureDetector *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LinearConstrainer const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGestureDetector const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::LinearConstrainer *) &(arg1)->operator =((Dali::LinearConstrainer const &)*arg2);
+      result = (Dali::PanGestureDetector *) &(arg1)->operator =((Dali::PanGestureDetector const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -19760,453 +14630,567 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
-  SwigValueWrapper< Dali::Property > arg2 ;
-  SwigValueWrapper< Dali::Property > arg3 ;
-  Dali::Vector2 *arg4 = 0 ;
-  Dali::Vector2 *arg5 = 0 ;
-  Dali::Property *argp2 ;
-  Dali::Property *argp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMinimumTouchesRequired(void * jarg1, unsigned int jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
-  argp2 = (Dali::Property *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  argp3 = (Dali::Property *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  arg4 = (Dali::Vector2 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
-  }
-  arg5 = (Dali::Vector2 *)jarg5;
-  if (!arg5) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4,(Dali::Vector2 const &)*arg5);
+      (arg1)->SetMinimumTouchesRequired(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
-  SwigValueWrapper< Dali::Property > arg2 ;
-  SwigValueWrapper< Dali::Property > arg3 ;
-  Dali::Vector2 *arg4 = 0 ;
-  Dali::Property *argp2 ;
-  Dali::Property *argp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMaximumTouchesRequired(void * jarg1, unsigned int jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
-  argp2 = (Dali::Property *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  argp3 = (Dali::Property *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  arg4 = (Dali::Vector2 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  arg2 = (unsigned int)jarg2;
+  {
+    try {
+      (arg1)->SetMaximumTouchesRequired(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
+
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMaximumMotionEventAge(void * jarg1, unsigned int jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  uint32_t arg2 ;
+
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  arg2 = (uint32_t)jarg2;
   {
     try {
-      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4);
+      (arg1)->SetMaximumMotionEventAge(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Remove(void * jarg1, void * jarg2) {
-  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
-  Dali::Handle *arg2 = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::LinearConstrainer *)jarg1;
-  arg2 = (Dali::Handle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
-      (arg1)->Remove(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (unsigned int)((Dali::PanGestureDetector const *)arg1)->GetMinimumTouchesRequired();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_FORWARD_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PathConstrainer::Property::FORWARD;
-  jresult = (int)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_POINTS_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::PathConstrainer::Property::POINTS;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  unsigned int result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_CONTROL_POINTS_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  {
+    try {
+      result = (unsigned int)((Dali::PanGestureDetector const *)arg1)->GetMaximumTouchesRequired();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::PathConstrainer::Property::CONTROL_POINTS;
-  jresult = (int)result;
+  jresult = result;
   return jresult;
 }
 
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMaximumMotionEventAge(void * jarg1) {
+  unsigned int jresult ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  uint32_t result;
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer_Property() {
-  void * jresult ;
-  Dali::PathConstrainer::Property *result = 0 ;
-
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
-      result = (Dali::PathConstrainer::Property *)new Dali::PathConstrainer::Property();
+      result = (uint32_t)((Dali::PanGestureDetector const *)arg1)->GetMaximumMotionEventAge();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PathConstrainer_Property(void * jarg1) {
-  Dali::PathConstrainer::Property *arg1 = (Dali::PathConstrainer::Property *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian arg3 ;
+  Dali::Radian *argp2 ;
+  Dali::Radian *argp3 ;
 
-  arg1 = (Dali::PathConstrainer::Property *)jarg1;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  argp3 = (Dali::Radian *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg3 = *argp3;
   {
     try {
-      delete arg1;
+      (arg1)->AddAngle(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_New() {
-  void * jresult ;
-  Dali::PathConstrainer result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_1(void * jarg1, void * jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp2 ;
 
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = Dali::PathConstrainer::New();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->AddAngle(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::PathConstrainer((const Dali::PathConstrainer &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::PathConstrainer result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian arg3 ;
+  Dali::Radian *argp2 ;
+  Dali::Radian *argp3 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
   }
-  arg1 = *argp1;
+  arg2 = *argp2;
+  argp3 = (Dali::Radian *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg3 = *argp3;
   {
     try {
-      result = Dali::PathConstrainer::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->AddDirection(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::PathConstrainer((const Dali::PathConstrainer &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer__SWIG_0() {
-  void * jresult ;
-  Dali::PathConstrainer *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_1(void * jarg1, void * jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp2 ;
 
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::PathConstrainer *)new Dali::PathConstrainer();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->AddDirection(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PathConstrainer(void * jarg1) {
-  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngleCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  size_t result;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::PanGestureDetector const *)arg1)->GetAngleCount();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (unsigned long)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngle(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::PathConstrainer *arg1 = 0 ;
-  Dali::PathConstrainer *result = 0 ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  size_t arg2 ;
+  Dali::PanGestureDetector::AngleThresholdPair result;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PathConstrainer const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      result = (Dali::PathConstrainer *)new Dali::PathConstrainer((Dali::PathConstrainer const &)*arg1);
+      result = ((Dali::PanGestureDetector const *)arg1)->GetAngle(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PanGestureDetector::AngleThresholdPair((const Dali::PanGestureDetector::AngleThresholdPair &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
-  Dali::PathConstrainer *arg2 = 0 ;
-  Dali::PathConstrainer *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_ClearAngles(void * jarg1) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
-  arg2 = (Dali::PathConstrainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PathConstrainer const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
-      result = (Dali::PathConstrainer *) &(arg1)->operator =((Dali::PathConstrainer const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->ClearAngles();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
-  SwigValueWrapper< Dali::Property > arg2 ;
-  SwigValueWrapper< Dali::Property > arg3 ;
-  Dali::Vector2 *arg4 = 0 ;
-  Dali::Vector2 *arg5 = 0 ;
-  Dali::Property *argp2 ;
-  Dali::Property *argp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveAngle(void * jarg1, void * jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp2 ;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
-  argp2 = (Dali::Property *)jarg2;
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
   if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
     return ;
   }
   arg2 = *argp2;
-  argp3 = (Dali::Property *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
+  {
+    try {
+      (arg1)->RemoveAngle(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
-  arg3 = *argp3;
-  arg4 = (Dali::Vector2 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveDirection(void * jarg1, void * jarg2) {
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp2 ;
+
+  arg1 = (Dali::PanGestureDetector *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
     return ;
   }
-  arg5 = (Dali::Vector2 *)jarg5;
-  if (!arg5) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return ;
+  arg2 = *argp2;
+  {
+    try {
+      (arg1)->RemoveDirection(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DetectedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
+  Dali::PanGestureDetector::DetectedSignalType *result = 0 ;
+
+  arg1 = (Dali::PanGestureDetector *)jarg1;
   {
     try {
-      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4,(Dali::Vector2 const &)*arg5);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::PanGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
-  SwigValueWrapper< Dali::Property > arg2 ;
-  SwigValueWrapper< Dali::Property > arg3 ;
-  Dali::Vector2 *arg4 = 0 ;
-  Dali::Property *argp2 ;
-  Dali::Property *argp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetPanGestureProperties(void * jarg1) {
+  Dali::PanGesture *arg1 = 0 ;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
-  argp2 = (Dali::Property *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  argp3 = (Dali::Property *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  arg4 = (Dali::Vector2 *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+  arg1 = (Dali::PanGesture *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
     return ;
   }
   {
     try {
-      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4);
+      Dali::PanGestureDetector::SetPanGestureProperties((Dali::PanGesture const &)*arg1);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Remove(void * jarg1, void * jarg2) {
-  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
-  Dali::Handle *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_New(int jarg1) {
+  void * jresult ;
+  Dali::GestureState arg1 ;
+  Dali::PanGesture result;
 
-  arg1 = (Dali::PathConstrainer *)jarg1;
-  arg2 = (Dali::Handle *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
-    return ;
+  arg1 = (Dali::GestureState)jarg1;
+  {
+    try {
+      result = DevelPanGesture::New(arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
+
+  jresult = new Dali::PanGesture((const Dali::PanGesture &)result);
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGesture(void * jarg1) {
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      (arg1)->Remove(*arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FittingModeDefault_get() {
-  int jresult ;
-  Dali::FittingMode::Type result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_velocity_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-  result = (Dali::FittingMode::Type)(Dali::FittingMode::Type)Dali::FittingMode::DEFAULT;
-  jresult = (int)result;
+  arg1 = (Dali::PanGesture *)jarg1;
+  {
+    try {
+      result = ((Dali::PanGesture const *)arg1)->GetVelocity();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_DEFAULT_get() {
-  int jresult ;
-  Dali::SamplingMode::Type result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_displacement_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-  result = (Dali::SamplingMode::Type)(Dali::SamplingMode::Type)Dali::SamplingMode::DEFAULT;
-  jresult = (int)result;
+  arg1 = (Dali::PanGesture *)jarg1;
+  {
+    try {
+      result = ((Dali::PanGesture const *)arg1)->GetDisplacement();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NativeImageInterface_CreateResource(void * jarg1) {
-  bool jresult ;
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_position_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = (bool)(arg1)->CreateResource();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::PanGesture const *)arg1)->GetPosition();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-  jresult = result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenVelocity_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageInterface_DestroyResource(void * jarg1) {
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
-
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      (arg1)->DestroyResource();
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::PanGesture const *)arg1)->GetScreenVelocity();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_TargetTexture(void * jarg1) {
-  unsigned int jresult ;
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
-  unsigned int result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenDisplacement_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = (unsigned int)(arg1)->TargetTexture();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::PanGesture const *)arg1)->GetScreenDisplacement();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-  jresult = result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageInterface_PrepareTexture(void * jarg1) {
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenPosition_get(void * jarg1) {
+  void * jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      (arg1)->PrepareTexture();
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::PanGesture const *)arg1)->GetScreenPosition();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGesture_numberOfTouches_get(void * jarg1) {
   unsigned int jresult ;
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   unsigned int result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
+  result = (unsigned int) ((arg1)->GetNumberOfTouches());
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetSpeed(void * jarg1) {
+  float jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  float result;
+
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = (unsigned int)((Dali::NativeImageInterface const *)arg1)->GetWidth();
+      result = (float)((Dali::PanGesture const *)arg1)->GetSpeed();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -20215,15 +15199,15 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetWidth(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetHeight(void * jarg1) {
-  unsigned int jresult ;
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
-  unsigned int result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetDistance(void * jarg1) {
+  float jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  float result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = (unsigned int)((Dali::NativeImageInterface const *)arg1)->GetHeight();
+      result = (float)((Dali::PanGesture const *)arg1)->GetDistance();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -20232,15 +15216,15 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetHeight(v
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NativeImageInterface_RequiresBlending(void * jarg1) {
-  bool jresult ;
-  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
-  bool result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenSpeed(void * jarg1) {
+  float jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  float result;
 
-  arg1 = (Dali::NativeImageInterface *)jarg1;
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = (bool)((Dali::NativeImageInterface const *)arg1)->RequiresBlending();
+      result = (float)((Dali::PanGesture const *)arg1)->GetScreenSpeed();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -20248,894 +15232,934 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NativeImageInterface_RequiresBlending(vo
   return jresult;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_NativeImageInterface_GenerateUrl(void* nuiHandle)
-{
-  Dali::Toolkit::ImageUrl result;
-  Dali::NativeImageInterface* nativeImage = (Dali::NativeImageInterface*)nuiHandle;
-  void *jresult;
 
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenDistance(void * jarg1) {
+  float jresult ;
+  Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
+  float result;
+
+  arg1 = (Dali::PanGesture *)jarg1;
   {
     try {
-      result = Dali::Toolkit::Image::GenerateUrl(nativeImage);
-    }
-    CALL_CATCH_EXCEPTION(0);
+      result = (float)((Dali::PanGesture const *)arg1)->GetScreenDistance();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl &)result);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TYPE_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::CameraActor::Property::TYPE;
-  jresult = (int)result;
-  return jresult;
-}
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_New() {
+  void * jresult ;
+  Dali::PinchGestureDetector result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MODE_get() {
-  int jresult ;
-  int result;
+  {
+    try {
+      result = Dali::PinchGestureDetector::New();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::CameraActor::Property::PROJECTION_MODE;
-  jresult = (int)result;
+  jresult = new Dali::PinchGestureDetector((const Dali::PinchGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FIELD_OF_VIEW_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::CameraActor::Property::FIELD_OF_VIEW;
-  jresult = (int)result;
-  return jresult;
-}
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetector(void * jarg1) {
+  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_ASPECT_RATIO_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PinchGestureDetector *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::CameraActor::Property::ASPECT_RATIO;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_NEAR_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::CameraActor::Property::NEAR_PLANE_DISTANCE;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetector__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::PinchGestureDetector *arg1 = 0 ;
+  Dali::PinchGestureDetector *result = 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FAR_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PinchGestureDetector *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGestureDetector const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::PinchGestureDetector *)new Dali::PinchGestureDetector((Dali::PinchGestureDetector const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::CameraActor::Property::FAR_PLANE_DISTANCE;
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_LEFT_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::CameraActor::Property::LEFT_PLANE_DISTANCE;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_Assign(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
+  Dali::PinchGestureDetector *arg2 = 0 ;
+  Dali::PinchGestureDetector *result = 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_RIGHT_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PinchGestureDetector *)jarg1;
+  arg2 = (Dali::PinchGestureDetector *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGestureDetector const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::PinchGestureDetector *) &(arg1)->operator =((Dali::PinchGestureDetector const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::CameraActor::Property::RIGHT_PLANE_DISTANCE;
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TOP_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::CameraActor::Property::TOP_PLANE_DISTANCE;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_DetectedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
+  Dali::PinchGestureDetector::DetectedSignalType *result = 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_BOTTOM_PLANE_DISTANCE_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PinchGestureDetector *)jarg1;
+  {
+    try {
+      result = (Dali::PinchGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::CameraActor::Property::BOTTOM_PLANE_DISTANCE;
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TARGET_POSITION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::CameraActor::Property::TARGET_POSITION;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_New(int jarg1) {
+  void * jresult ;
+  Dali::GestureState arg1 ;
+  Dali::PinchGesture result;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MATRIX_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::GestureState)jarg1;
+  {
+    try {
+      result = DevelPinchGesture::New(arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  result = (int)Dali::CameraActor::Property::PROJECTION_MATRIX;
-  jresult = (int)result;
+  jresult = new Dali::PinchGesture((const Dali::PinchGesture &)result);
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_VIEW_MATRIX_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::CameraActor::Property::VIEW_MATRIX;
-  jresult = (int)result;
-  return jresult;
-}
-
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGesture(void * jarg1) {
+  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_INVERT_Y_AXIS_get() {
-  int jresult ;
-  int result;
+  arg1 = (Dali::PinchGesture *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  result = (int)Dali::CameraActor::Property::INVERT_Y_AXIS;
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_ORTHOGRAPHIC_SIZE_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_scale_get(void * jarg1) {
+  float jresult ;
+  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
+  float result;
 
-  result = (int)Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE;
-  jresult = (int)result;
+  arg1 = (Dali::PinchGesture *)jarg1;
+  result = (float) ((arg1)->GetScale());
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_DIRECTION_get() {
-  int jresult ;
-  int result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_speed_get(void * jarg1) {
+  float jresult ;
+  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
+  float result;
 
-  result = (int)Dali::DevelCameraActor::Property::PROJECTION_DIRECTION;
-  jresult = (int)result;
+  arg1 = (Dali::PinchGesture *)jarg1;
+  result = (float) ((arg1)->GetSpeed());
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_screenCenterPoint_get(void * jarg1) {
   void * jresult ;
-  Dali::CameraActor::Property *result = 0 ;
+  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
+  Dali::Vector2 result;
 
+  arg1 = (Dali::PinchGesture *)jarg1;
   {
     try {
-      result = (Dali::CameraActor::Property *)new Dali::CameraActor::Property();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::PinchGesture const *)arg1)->GetScreenCenterPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-  jresult = (void *)result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor_Property(void * jarg1) {
-  Dali::CameraActor::Property *arg1 = (Dali::CameraActor::Property *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_localCenterPoint_get(void * jarg1) {
+  void * jresult ;
+  Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::CameraActor::Property *)jarg1;
+  arg1 = (Dali::PinchGesture *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::PinchGesture const *)arg1)->GetLocalCenterPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_0() {
   void * jresult ;
-  Dali::CameraActor *result = 0 ;
+  Dali::TapGestureDetector result;
 
   {
     try {
-      result = (Dali::CameraActor *)new Dali::CameraActor();
+      result = Dali::TapGestureDetector::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::TapGestureDetector((const Dali::TapGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_1(unsigned int jarg1) {
   void * jresult ;
-  Dali::CameraActor result;
+  unsigned int arg1 ;
+  Dali::TapGestureDetector result;
 
+  arg1 = (unsigned int)jarg1;
   {
     try {
-      result = Dali::CameraActor::New();
+      result = Dali::TapGestureDetector::New(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
+  jresult = new Dali::TapGestureDetector((const Dali::TapGestureDetector &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Size *arg1 = 0 ;
-  Dali::CameraActor result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetector(void * jarg1) {
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
 
-  arg1 = (Dali::Size *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TapGestureDetector *)jarg1;
   {
     try {
-      result = Dali::CameraActor::New((Dali::Vector2 const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New3DCamera() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::CameraActor result;
+  Dali::TapGestureDetector *arg1 = 0 ;
+  Dali::TapGestureDetector *result = 0 ;
 
+  arg1 = (Dali::TapGestureDetector *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGestureDetector const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = Dali::CameraActor::New3DCamera();
+      result = (Dali::TapGestureDetector *)new Dali::TapGestureDetector((Dali::TapGestureDetector const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_DownCast(void * jarg1) {
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::CameraActor result;
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  Dali::TapGestureDetector *arg2 = 0 ;
+  Dali::TapGestureDetector *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg2 = (Dali::TapGestureDetector *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGestureDetector const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::CameraActor::DownCast(arg1);
+      result = (Dali::TapGestureDetector *) &(arg1)->operator =((Dali::TapGestureDetector const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor(void * jarg1) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMinimumTapsRequired(void * jarg1, unsigned int jarg2) {
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->SetMinimumTapsRequired(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::CameraActor *arg1 = 0 ;
-  Dali::CameraActor *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMaximumTapsRequired(void * jarg1, unsigned int jarg2) {
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CameraActor const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TapGestureDetector *)jarg1;
+  arg2 = (unsigned int)jarg2;
   {
     try {
-      result = (Dali::CameraActor *)new Dali::CameraActor((Dali::CameraActor const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetMaximumTapsRequired(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::CameraActor *arg2 = 0 ;
-  Dali::CameraActor *result = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMinimumTapsRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::CameraActor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CameraActor const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::TapGestureDetector *)jarg1;
   {
     try {
-      result = (Dali::CameraActor *) &(arg1)->operator =((Dali::CameraActor const &)*arg2);
+      result = (unsigned int)((Dali::TapGestureDetector const *)arg1)->GetMinimumTapsRequired();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetType(void * jarg1, int jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Camera::Type arg2 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMaximumTapsRequired(void * jarg1) {
+  unsigned int jresult ;
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::Camera::Type)jarg2;
+  arg1 = (Dali::TapGestureDetector *)jarg1;
   {
     try {
-      (arg1)->SetType(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (unsigned int)((Dali::TapGestureDetector const *)arg1)->GetMaximumTapsRequired();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetType(void * jarg1) {
-  int jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Camera::Type result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_DetectedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
+  Dali::TapGestureDetector::DetectedSignalType *result = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::TapGestureDetector *)jarg1;
   {
     try {
-      result = (Dali::Camera::Type)((Dali::CameraActor const *)arg1)->GetType();
+      result = (Dali::TapGestureDetector::DetectedSignalType *) &(arg1)->DetectedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (int)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetProjectionMode(void * jarg1, int jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Camera::ProjectionMode arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_New(int jarg1) {
+  void * jresult ;
+  Dali::GestureState arg1 ;
+  Dali::TapGesture result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::Camera::ProjectionMode)jarg2;
+  arg1 = (Dali::GestureState)jarg1;
   {
     try {
-      (arg1)->SetProjectionMode(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = DevelTapGesture::New(arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::TapGesture((const Dali::TapGesture &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetProjectionMode(void * jarg1) {
-  int jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Camera::ProjectionMode result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGesture(void * jarg1) {
+  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::TapGesture *)jarg1;
   {
     try {
-      result = (Dali::Camera::ProjectionMode)((Dali::CameraActor const *)arg1)->GetProjectionMode();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (int)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFieldOfView(void * jarg1, float jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float arg2 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTaps_get(void * jarg1) {
+  unsigned int jresult ;
+  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetFieldOfView(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+  arg1 = (Dali::TapGesture *)jarg1;
+  result = (unsigned int) ((arg1)->GetNumberOfTaps());
+  jresult = result;
+  return jresult;
+}
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTouches_get(void * jarg1) {
+  unsigned int jresult ;
+  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+  unsigned int result;
 
+  arg1 = (Dali::TapGesture *)jarg1;
+  result = (unsigned int) ((arg1)->GetNumberOfTouches());
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFieldOfView(void * jarg1) {
-  float jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_screenPoint_get(void * jarg1) {
+  void * jresult ;
+  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::TapGesture *)jarg1;
   {
     try {
-      result = (float)(arg1)->GetFieldOfView();
-    } CALL_CATCH_EXCEPTION(0);
+      result = ((Dali::TapGesture const *)arg1)->GetScreenPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
-  jresult = result;
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetAspectRatio(void * jarg1, float jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_localPoint_get(void * jarg1) {
+  void * jresult ;
+  Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
+  Dali::Vector2 result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::TapGesture *)jarg1;
   {
     try {
-      (arg1)->SetAspectRatio(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = ((Dali::TapGesture const *)arg1)->GetLocalPoint();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
   }
-
+  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetAspectRatio(void * jarg1) {
-  float jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_0() {
+  void * jresult ;
+  Dali::AlphaFunction *result = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
   {
     try {
-      result = (float)(arg1)->GetAspectRatio();
+      result = (Dali::AlphaFunction *)new Dali::AlphaFunction();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetNearClippingPlane(void * jarg1, float jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_1(int jarg1) {
+  void * jresult ;
+  Dali::AlphaFunction::BuiltinFunction arg1 ;
+  Dali::AlphaFunction *result = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::AlphaFunction::BuiltinFunction)jarg1;
   {
     try {
-      (arg1)->SetNearClippingPlane(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::AlphaFunction *)new Dali::AlphaFunction(arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetNearClippingPlane(void * jarg1) {
-  float jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_2(void * jarg1) {
+  void * jresult ;
+  Dali::AlphaFunctionPrototype arg1 = (Dali::AlphaFunctionPrototype) 0 ;
+  Dali::AlphaFunction *result = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::AlphaFunctionPrototype)jarg1;
   {
     try {
-      result = (float)(arg1)->GetNearClippingPlane();
+      result = (Dali::AlphaFunction *)new Dali::AlphaFunction(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFarClippingPlane(void * jarg1, float jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_3(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Vector2 *arg1 = 0 ;
+  Dali::Vector2 *arg2 = 0 ;
+  Dali::AlphaFunction *result = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::Vector2 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->SetFarClippingPlane(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::AlphaFunction *)new Dali::AlphaFunction((Dali::Vector2 const &)*arg1,(Dali::Vector2 const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFarClippingPlane(void * jarg1) {
-  float jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  float result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBezierControlPoints(void * jarg1) {
+  void * jresult ;
+  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
+  Dali::Vector4 result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::AlphaFunction *)jarg1;
   {
     try {
-      result = (float)(arg1)->GetFarClippingPlane();
+      result = ((Dali::AlphaFunction const *)arg1)->GetBezierControlPoints();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Vector4((const Dali::Vector4 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetTargetPosition(void * jarg1, void * jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return ;
-  }
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBuiltinFunction(void * jarg1) {
+  int jresult ;
+  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
+  Dali::AlphaFunction::BuiltinFunction result;
+
+  arg1 = (Dali::AlphaFunction *)jarg1;
   {
     try {
-      (arg1)->SetTargetPosition((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::AlphaFunction::BuiltinFunction)((Dali::AlphaFunction const *)arg1)->GetBuiltinFunction();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_GetTargetPosition(void * jarg1) {
-  void * jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Vector3 result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetMode(void * jarg1) {
+  int jresult ;
+  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
+  Dali::AlphaFunction::Mode result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
+  arg1 = (Dali::AlphaFunction *)jarg1;
   {
     try {
-      result = ((Dali::CameraActor const *)arg1)->GetTargetPosition();
+      result = (Dali::AlphaFunction::Mode)((Dali::AlphaFunction const *)arg1)->GetMode();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetInvertYAxis(void * jarg1, bool jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  bool arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AlphaFunction(void * jarg1) {
+  Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = jarg2 ? true : false;
+  arg1 = (Dali::AlphaFunction *)jarg1;
   {
     try {
-      (arg1)->SetInvertYAxis(arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CameraActor_GetInvertYAxis(void * jarg1) {
-  bool jresult ;
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_New() {
+  void * jresult ;
+  Dali::KeyFrames result;
 
-  arg1 = (Dali::CameraActor *)jarg1;
   {
     try {
-      result = (bool)(arg1)->GetInvertYAxis();
+      result = Dali::KeyFrames::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::KeyFrames((const Dali::KeyFrames &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetPerspectiveProjection(void * jarg1, void * jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Size *arg2 = 0 ;
-
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::Size *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetPerspectiveProjection((Dali::Size const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetOrthographicProjection__SWIG_0(void * jarg1, void * jarg2) {
-  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
-  Dali::Size *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyFrames(void * jarg1) {
+  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
 
-  arg1 = (Dali::CameraActor *)jarg1;
-  arg2 = (Dali::Size *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::KeyFrames *)jarg1;
   {
     try {
-      (arg1)->SetOrthographicProjection((Dali::Size const &)*arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_0() {
-  void * jresult ;
-  std::pair< std::string,Dali::Property::Value > *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_KeyFrames_GetType(void * jarg1) {
+  int jresult ;
+  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
+  Dali::Property::Type result;
 
+  arg1 = (Dali::KeyFrames *)jarg1;
   {
     try {
-      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >();
+      result = (Dali::Property::Type)((Dali::KeyFrames const *)arg1)->GetType();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_1(char * jarg1, void * jarg2) {
-  void * jresult ;
-  std::string arg1 ;
-  Dali::Property::Value arg2 ;
-  Dali::Property::Value *argp2 ;
-  std::pair< std::string,Dali::Property::Value > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_0(void * jarg1, float jarg2, void * jarg3) {
+  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
+  float arg2 ;
+  Dali::Property::Value arg3 ;
+  Dali::Property::Value *argp3 ;
 
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  (&arg1)->assign(jarg1);
-  argp2 = (Dali::Property::Value *)jarg2;
-  if (!argp2) {
+  arg1 = (Dali::KeyFrames *)jarg1;
+  arg2 = (float)jarg2;
+  argp3 = (Dali::Property::Value *)jarg3;
+  if (!argp3) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
-    return 0;
+    return ;
   }
-  arg2 = *argp2;
+  arg3 = *argp3;
   {
     try {
-      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Add(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_2(void * jarg1) {
-  void * jresult ;
-  std::pair< std::string,Dali::Property::Value > *arg1 = 0 ;
-  std::pair< std::string,Dali::Property::Value > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_1(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
+  Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
+  float arg2 ;
+  Dali::Property::Value arg3 ;
+  Dali::AlphaFunction arg4 ;
+  Dali::Property::Value *argp3 ;
+  Dali::AlphaFunction *argp4 ;
 
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< std::string,Dali::Property::Value > const & type is null", 0);
-    return 0;
+  arg1 = (Dali::KeyFrames *)jarg1;
+  arg2 = (float)jarg2;
+  argp3 = (Dali::Property::Value *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
+    return ;
   }
+  arg3 = *argp3;
+  argp4 = (Dali::AlphaFunction *)jarg4;
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::AlphaFunction", 0);
+    return ;
+  }
+  arg4 = *argp4;
   {
     try {
-      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >((std::pair< std::string,Dali::Property::Value > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Add(arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_KeyFrames_GetKeyFrameCount(void* keyFrames)
+{
+  unsigned int jresult;
+  {
+    try {
+      jresult = Dali::DevelKeyFrames::GetKeyFrameCount(*((Dali::KeyFrames*)keyFrames));
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return jresult;
+}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_first_set(void * jarg1, char * jarg2) {
-  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
-  std::string *arg2 = 0 ;
-
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_GetKeyFrame(void* keyFrames, unsigned int index, float* time, void* value)
+{
+  if (!value) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
     return ;
   }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  if (arg1) (arg1)->first = *arg2;
-
-  //argout typemap for const std::string&
-
+  try {
+    Dali::DevelKeyFrames::GetKeyFrame(*((Dali::KeyFrames*)keyFrames), (size_t)index, *time, *((Property::Value*)value));
+  } CALL_CATCH_EXCEPTION();
 }
 
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_StringValuePair_first_get(void * jarg1) {
-  char * jresult ;
-  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
-  std::string *result = 0 ;
-
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
-  result = (std::string *) & ((arg1)->first);
-  jresult = SWIG_csharp_string_callback(result->c_str());
-  return jresult;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_SetKeyFrameValue(void* keyFrames, unsigned int index, void* value)
+{
+  if (!value) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
+    return ;
+  }
+  try {
+    Dali::DevelKeyFrames::SetKeyFrameValue(*((Dali::KeyFrames*)keyFrames), (size_t)index, *((const Property::Value*)value));
+  } CALL_CATCH_EXCEPTION();
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_POINTS_get() {
+  int jresult ;
+  int result;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_second_set(void * jarg1, void * jarg2) {
-  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
-  Dali::Property::Value *arg2 = (Dali::Property::Value *) 0 ;
-
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
-  arg2 = (Dali::Property::Value *)jarg2;
-  if (arg1) (arg1)->second = *arg2;
+  result = (int)Dali::Path::Property::POINTS;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StringValuePair_second_get(void * jarg1) {
-  void * jresult ;
-  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
-  Dali::Property::Value *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_CONTROL_POINTS_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
-  result = (Dali::Property::Value *)& ((arg1)->second);
-  jresult = (void *)result;
+  result = (int)Dali::Path::Property::CONTROL_POINTS;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StringValuePair(void * jarg1) {
-  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_New() {
+  void * jresult ;
+  Dali::Path result;
 
-  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = Dali::Path::New();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Path((const Dali::Path &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Clear(void * jarg1) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Path(void * jarg1) {
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg1 = (Dali::Path *)jarg1;
   {
     try {
-      (arg1)->clear();
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Add(void * jarg1, void * jarg2) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  Dali::TouchPoint *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddPoint(void * jarg1, void * jarg2) {
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (Dali::TouchPoint *)jarg2;
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
     return ;
   }
   {
     try {
-      (arg1)->push_back((Dali::TouchPoint const &)*arg2);
+      (arg1)->AddPoint((Dali::Vector3 const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_size(void * jarg1) {
-  unsigned long jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  std::vector< Dali::TouchPoint >::size_type result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddControlPoint(void * jarg1, void * jarg2) {
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  {
-    try {
-      result = ((std::vector< Dali::TouchPoint > const *)arg1)->size();
-    } CALL_CATCH_EXCEPTION(0);
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
   }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_capacity(void * jarg1) {
-  unsigned long jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  std::vector< Dali::TouchPoint >::size_type result;
-
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      result = ((std::vector< Dali::TouchPoint > const *)arg1)->capacity();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->AddControlPoint((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_reserve(void * jarg1, unsigned long jarg2) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  std::vector< Dali::TouchPoint >::size_type arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_GenerateControlPoints(void * jarg1, float jarg2) {
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  float arg2 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (std::vector< Dali::TouchPoint >::size_type)jarg2;
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      (arg1)->reserve(arg2);
+      (arg1)->GenerateControlPoints(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_0() {
-  void * jresult ;
-  std::vector< Dali::TouchPoint > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_Sample(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  float arg2 ;
+  Dali::Vector3 *arg3 = 0 ;
+  Dali::Vector3 *arg4 = 0 ;
 
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (Dali::Vector3 *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
+    return ;
+  }
+  arg4 = (Dali::Vector3 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (std::vector< Dali::TouchPoint > *)new std::vector< Dali::TouchPoint >();
-    } CALL_CATCH_EXCEPTION(0);
+      ((Dali::Path const *)arg1)->Sample(arg2,*arg3,*arg4);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetPoint(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = 0 ;
-  std::vector< Dali::TouchPoint > *result = 0 ;
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  size_t arg2 ;
+  Dali::Vector3 *result = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      result = (std::vector< Dali::TouchPoint > *)new std::vector< Dali::TouchPoint >((std::vector< Dali::TouchPoint > const &)*arg1);
+      result = (Dali::Vector3 *) &(arg1)->GetPoint(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21144,22 +16168,17 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetControlPoint(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  int arg1 ;
-  std::vector< Dali::TouchPoint > *result = 0 ;
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  size_t arg2 ;
+  Dali::Vector3 *result = 0 ;
 
-  arg1 = (int)jarg1;
+  arg1 = (Dali::Path *)jarg1;
+  arg2 = (size_t)jarg2;
   {
     try {
-      try {
-        result = (std::vector< Dali::TouchPoint > *)new_std_vector_Sl_Dali_TouchPoint_Sg___SWIG_2(arg1);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = (Dali::Vector3 *) &(arg1)->GetControlPoint(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21168,50 +16187,32 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_2(int ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitemcopy(void * jarg1, int jarg2) {
-  void * jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  SwigValueWrapper< Dali::TouchPoint > result;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Path_GetPointCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Path *arg1 = (Dali::Path *) 0 ;
+  size_t result;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (Dali::Path *)jarg1;
   {
     try {
-      try {
-        result = std_vector_Sl_Dali_TouchPoint_Sg__getitemcopy(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = ((Dali::Path const *)arg1)->GetPointCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::TouchPoint((const Dali::TouchPoint &)result);
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_0(float jarg1) {
   void * jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  Dali::TouchPoint *result = 0 ;
+  float arg1 ;
+  Dali::TimePeriod *result = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (float)jarg1;
   {
     try {
-      try {
-        result = (Dali::TouchPoint *) &std_vector_Sl_Dali_TouchPoint_Sg__getitem(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = (Dali::TimePeriod *)new Dali::TimePeriod(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21220,213 +16221,144 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitem(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  Dali::TouchPoint *arg3 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_1(float jarg1, float jarg2) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  Dali::TimePeriod *result = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (Dali::TouchPoint *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
-    return ;
-  }
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
   {
     try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__setitem(arg1,arg2,(Dali::TouchPoint const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::TimePeriod *)new Dali::TimePeriod(arg1,arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_AddRange(void * jarg1, void * jarg2) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  std::vector< Dali::TouchPoint > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimePeriod(void * jarg1) {
+  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (std::vector< Dali::TouchPoint > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::TimePeriod *)jarg1;
   {
     try {
-      std_vector_Sl_Dali_TouchPoint_Sg__AddRange(arg1,(std::vector< Dali::TouchPoint > const &)*arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  std::vector< Dali::TouchPoint > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_set(void * jarg1, float jarg2) {
+  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
+  float arg2 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  {
-    try {
-      try {
-        result = (std::vector< Dali::TouchPoint > *)std_vector_Sl_Dali_TouchPoint_Sg__GetRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return 0;
-      }
+  arg1 = (Dali::TimePeriod *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->delaySeconds = arg2;
+}
 
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_get(void * jarg1) {
+  float jresult ;
+  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
+  float result;
+
+  arg1 = (Dali::TimePeriod *)jarg1;
+  result = (float) ((arg1)->delaySeconds);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  Dali::TouchPoint *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_set(void * jarg1, float jarg2) {
+  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
+  float arg2 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (Dali::TouchPoint *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__Insert(arg1,arg2,(Dali::TouchPoint const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
+  arg1 = (Dali::TimePeriod *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->durationSeconds = arg2;
+}
 
-    } CALL_CATCH_EXCEPTION();
-  }
 
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_get(void * jarg1) {
+  float jresult ;
+  Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
+  float result;
+
+  arg1 = (Dali::TimePeriod *)jarg1;
+  result = (float) ((arg1)->durationSeconds);
+  jresult = result;
+  return jresult;
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_VALUE_get() {
+  int jresult ;
+  int result;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  std::vector< Dali::TouchPoint > *arg3 = 0 ;
+  result = (int)Dali::LinearConstrainer::Property::VALUE;
+  jresult = (int)result;
+  return jresult;
+}
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< Dali::TouchPoint > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__InsertRange(arg1,arg2,(std::vector< Dali::TouchPoint > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
 
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_PROGRESS_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::LinearConstrainer::Property::PROGRESS;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveAt(void * jarg1, int jarg2) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_New() {
+  void * jresult ;
+  Dali::LinearConstrainer result;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
   {
     try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__RemoveAt(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
-    } CALL_CATCH_EXCEPTION();
+      result = Dali::LinearConstrainer::New();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::LinearConstrainer((const Dali::LinearConstrainer &)result);
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  int arg3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer(void * jarg1) {
+  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
+  arg1 = (Dali::LinearConstrainer *)jarg1;
   {
     try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__RemoveRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
-
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::TouchPoint *arg1 = 0 ;
-  int arg2 ;
-  std::vector< Dali::TouchPoint > *result = 0 ;
+  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
+  Dali::LinearConstrainer *arg2 = 0 ;
+  Dali::LinearConstrainer *result = 0 ;
 
-  arg1 = (Dali::TouchPoint *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
+  arg1 = (Dali::LinearConstrainer *)jarg1;
+  arg2 = (Dali::LinearConstrainer *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LinearConstrainer const & type is null", 0);
     return 0;
   }
-  arg2 = (int)jarg2;
   {
     try {
-      try {
-        result = (std::vector< Dali::TouchPoint > *)std_vector_Sl_Dali_TouchPoint_Sg__Repeat((Dali::TouchPoint const &)*arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = (Dali::LinearConstrainer *) &(arg1)->operator =((Dali::LinearConstrainer const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21435,118 +16367,184 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_Repeat(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_0(void * jarg1) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
+  SwigValueWrapper< Dali::Property > arg2 ;
+  SwigValueWrapper< Dali::Property > arg3 ;
+  Dali::Vector2 *arg4 = 0 ;
+  Dali::Vector2 *arg5 = 0 ;
+  Dali::Property *argp2 ;
+  Dali::Property *argp3 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg1 = (Dali::LinearConstrainer *)jarg1;
+  argp2 = (Dali::Property *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  argp3 = (Dali::Property *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg3 = *argp3;
+  arg4 = (Dali::Vector2 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
+  }
+  arg5 = (Dali::Vector2 *)jarg5;
+  if (!arg5) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      std_vector_Sl_Dali_TouchPoint_Sg__Reverse__SWIG_0(arg1);
+      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4,(Dali::Vector2 const &)*arg5);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  int arg3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
+  SwigValueWrapper< Dali::Property > arg2 ;
+  SwigValueWrapper< Dali::Property > arg3 ;
+  Dali::Vector2 *arg4 = 0 ;
+  Dali::Property *argp2 ;
+  Dali::Property *argp3 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
+  arg1 = (Dali::LinearConstrainer *)jarg1;
+  argp2 = (Dali::Property *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  argp3 = (Dali::Property *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg3 = *argp3;
+  arg4 = (Dali::Vector2 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
-
+      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
-  int arg2 ;
-  std::vector< Dali::TouchPoint > *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Remove(void * jarg1, void * jarg2) {
+  Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
+  Dali::Handle *arg2 = 0 ;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< Dali::TouchPoint > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
+  arg1 = (Dali::LinearConstrainer *)jarg1;
+  arg2 = (Dali::Handle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
     return ;
   }
   {
     try {
-      try {
-        std_vector_Sl_Dali_TouchPoint_Sg__SetRange(arg1,arg2,(std::vector< Dali::TouchPoint > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
+      (arg1)->Remove(*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPointContainer(void * jarg1) {
-  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_FORWARD_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+  result = (int)Dali::PathConstrainer::Property::FORWARD;
+  jresult = (int)result;
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_POINTS_get() {
+  int jresult ;
+  int result;
 
+  result = (int)Dali::PathConstrainer::Property::POINTS;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_0() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_CONTROL_POINTS_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::PathConstrainer::Property::CONTROL_POINTS;
+  jresult = (int)result;
+  return jresult;
+}
+
+
+
+
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_New() {
   void * jresult ;
-  Dali::Rect< int > *result = 0 ;
+  Dali::PathConstrainer result;
 
   {
     try {
-      result = (Dali::Rect< int > *)new Dali::Rect< int >();
+      result = Dali::PathConstrainer::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::PathConstrainer((const Dali::PathConstrainer &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4) {
+
+
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PathConstrainer(void * jarg1) {
+  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+
+  arg1 = (Dali::PathConstrainer *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  Dali::Rect< int > *result = 0 ;
+  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+  Dali::PathConstrainer *arg2 = 0 ;
+  Dali::PathConstrainer *result = 0 ;
 
-  arg1 = (int)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  arg4 = (int)jarg4;
+  arg1 = (Dali::PathConstrainer *)jarg1;
+  arg2 = (Dali::PathConstrainer *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PathConstrainer const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Rect< int > *)new Dali::Rect< int >(arg1,arg2,arg3,arg4);
+      result = (Dali::PathConstrainer *) &(arg1)->operator =((Dali::PathConstrainer const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21555,114 +16553,118 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_1(int jarg1, int j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_2(void * jarg1) {
-  void * jresult ;
-  Dali::Rect< int > *arg1 = 0 ;
-  Dali::Rect< int > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+  SwigValueWrapper< Dali::Property > arg2 ;
+  SwigValueWrapper< Dali::Property > arg3 ;
+  Dali::Vector2 *arg4 = 0 ;
+  Dali::Vector2 *arg5 = 0 ;
+  Dali::Property *argp2 ;
+  Dali::Property *argp3 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
-    return 0;
+  arg1 = (Dali::PathConstrainer *)jarg1;
+  argp2 = (Dali::Property *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  argp3 = (Dali::Property *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg3 = *argp3;
+  arg4 = (Dali::Vector2 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
+  }
+  arg5 = (Dali::Vector2 *)jarg5;
+  if (!arg5) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Rect< int > *)new Dali::Rect< int >((Dali::Rect< int > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4,(Dali::Vector2 const &)*arg5);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Rectangle_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  Dali::Rect< int > *arg2 = 0 ;
-  Dali::Rect< int > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+  SwigValueWrapper< Dali::Property > arg2 ;
+  SwigValueWrapper< Dali::Property > arg3 ;
+  Dali::Vector2 *arg4 = 0 ;
+  Dali::Property *argp2 ;
+  Dali::Property *argp3 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (Dali::Rect< int > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
-    return 0;
+  arg1 = (Dali::PathConstrainer *)jarg1;
+  argp2 = (Dali::Property *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  argp3 = (Dali::Property *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property", 0);
+    return ;
+  }
+  arg3 = *argp3;
+  arg4 = (Dali::Vector2 *)jarg4;
+  if (!arg4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Rect< int > *) &(arg1)->operator =((Dali::Rect< int > const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Apply(arg2,arg3,(Dali::Vector2 const &)*arg4);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_Set(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Remove(void * jarg1, void * jarg2) {
+  Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
+  Dali::Handle *arg2 = 0 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  arg4 = (int)jarg4;
-  arg5 = (int)jarg5;
+  arg1 = (Dali::PathConstrainer *)jarg1;
+  arg2 = (Dali::Handle *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Handle & type is null", 0);
+    return ;
+  }
   {
     try {
-      (arg1)->Set(arg2,arg3,arg4,arg5);
+      (arg1)->Remove(*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_IsEmpty(void * jarg1) {
-  bool jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  bool result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::Rect< int > const *)arg1)->IsEmpty();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Left(void * jarg1) {
-  int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  {
-    try {
-      result = (int)((Dali::Rect< int > const *)arg1)->Left();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Right(void * jarg1) {
-  int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_TargetTexture(void * jarg1) {
+  unsigned int jresult ;
+  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
+  arg1 = (Dali::NativeImageInterface *)jarg1;
   {
     try {
-      result = (int)((Dali::Rect< int > const *)arg1)->Right();
+      result = (unsigned int)(arg1)->TargetTexture();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21671,32 +16673,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Right(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Top(void * jarg1) {
-  int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageInterface_PrepareTexture(void * jarg1) {
+  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
+  arg1 = (Dali::NativeImageInterface *)jarg1;
   {
     try {
-      result = (int)((Dali::Rect< int > const *)arg1)->Top();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->PrepareTexture();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Bottom(void * jarg1) {
-  int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetWidth(void * jarg1) {
+  unsigned int jresult ;
+  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
+  arg1 = (Dali::NativeImageInterface *)jarg1;
   {
     try {
-      result = (int)((Dali::Rect< int > const *)arg1)->Bottom();
+      result = (unsigned int)((Dali::NativeImageInterface const *)arg1)->GetWidth();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21705,15 +16703,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Bottom(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Area(void * jarg1) {
-  int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetHeight(void * jarg1) {
+  unsigned int jresult ;
+  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
+  unsigned int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
+  arg1 = (Dali::NativeImageInterface *)jarg1;
   {
     try {
-      result = (int)((Dali::Rect< int > const *)arg1)->Area();
+      result = (unsigned int)((Dali::NativeImageInterface const *)arg1)->GetHeight();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21722,21 +16720,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Area(void * jarg1) {
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_Intersects(void * jarg1, void * jarg2) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_NativeImageInterface_RequiresBlending(void * jarg1) {
   bool jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  Dali::Rect< int > *arg2 = 0 ;
+  Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   bool result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (Dali::Rect< int > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::NativeImageInterface *)jarg1;
   {
     try {
-      result = (bool)((Dali::Rect< int > const *)arg1)->Intersects((Dali::Rect< int > const &)*arg2);
+      result = (bool)((Dali::NativeImageInterface const *)arg1)->RequiresBlending();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -21744,210 +16736,190 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_Intersects(void * jarg1, void
   return jresult;
 }
 
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_NativeImageInterface_GenerateUrl(void* nuiHandle)
+{
+  Dali::Toolkit::ImageUrl result;
+  Dali::NativeImageInterface* nativeImage = (Dali::NativeImageInterface*)nuiHandle;
+  void *jresult;
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_Contains(void * jarg1, void * jarg2) {
-  bool jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  Dali::Rect< int > *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (Dali::Rect< int > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (bool)((Dali::Rect< int > const *)arg1)->Contains((Dali::Rect< int > const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      result = Dali::Toolkit::Image::GenerateUrl(nativeImage);
+    }
+    CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_x_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TYPE_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->x = arg2;
+  result = (int)Dali::CameraActor::Property::TYPE;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_x_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MODE_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->x);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::PROJECTION_MODE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_left_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FIELD_OF_VIEW_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->left = arg2;
+  result = (int)Dali::CameraActor::Property::FIELD_OF_VIEW;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_left_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_ASPECT_RATIO_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->left);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::ASPECT_RATIO;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_y_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_NEAR_PLANE_DISTANCE_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->y = arg2;
+  result = (int)Dali::CameraActor::Property::NEAR_PLANE_DISTANCE;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_y_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FAR_PLANE_DISTANCE_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->y);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::FAR_PLANE_DISTANCE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_right_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_LEFT_PLANE_DISTANCE_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->right = arg2;
+  result = (int)Dali::CameraActor::Property::LEFT_PLANE_DISTANCE;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_right_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_RIGHT_PLANE_DISTANCE_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->right);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::RIGHT_PLANE_DISTANCE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_width_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TOP_PLANE_DISTANCE_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->width = arg2;
+  result = (int)Dali::CameraActor::Property::TOP_PLANE_DISTANCE;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_width_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_BOTTOM_PLANE_DISTANCE_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->width);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::BOTTOM_PLANE_DISTANCE;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_bottom_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TARGET_POSITION_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->bottom = arg2;
+  result = (int)Dali::CameraActor::Property::TARGET_POSITION;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_bottom_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MATRIX_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->bottom);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::PROJECTION_MATRIX;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_height_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_VIEW_MATRIX_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->height = arg2;
+  result = (int)Dali::CameraActor::Property::VIEW_MATRIX;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_height_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_INVERT_Y_AXIS_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->height);
-  jresult = result;
+  result = (int)Dali::CameraActor::Property::INVERT_Y_AXIS;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_top_set(void * jarg1, int jarg2) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_ORTHOGRAPHIC_SIZE_get() {
+  int jresult ;
+  int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  arg2 = (int)jarg2;
-  if (arg1) (arg1)->top = arg2;
+  result = (int)Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE;
+  jresult = (int)result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_top_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_DIRECTION_get() {
   int jresult ;
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
-  result = (int) ((arg1)->top);
-  jresult = result;
+  result = (int)Dali::DevelCameraActor::Property::PROJECTION_DIRECTION;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Rectangle(void * jarg1) {
-  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
 
-  arg1 = (Dali::Rect< int > *)jarg1;
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor_Property(void * jarg1) {
+  Dali::CameraActor::Property *arg1 = (Dali::CameraActor::Property *) 0 ;
+
+  arg1 = (Dali::CameraActor::Property *)jarg1;
   {
     try {
       delete arg1;
@@ -21957,57 +16929,86 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Rectangle(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_0() {
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_0() {
   void * jresult ;
-  Dali::Rect< float > *result = 0 ;
+  Dali::CameraActor result;
 
   {
     try {
-      result = (Dali::Rect< float > *)new Dali::Rect< float >();
+      result = Dali::CameraActor::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_1(void * jarg1) {
   void * jresult ;
-  float arg1 ;
-  float arg2 ;
-  float arg3 ;
-  float arg4 ;
-  Dali::Rect< float > *result = 0 ;
+  Dali::Size *arg1 = 0 ;
+  Dali::CameraActor result;
 
-  arg1 = (float)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg4;
-  arg4 = (float)jarg3;
+  arg1 = (Dali::Size *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = (Dali::Rect< float > *)new Dali::Rect< float >(arg1,arg2,arg3,arg4);
+      result = Dali::CameraActor::New((Dali::Vector2 const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New3DCamera() {
   void * jresult ;
-  Dali::Rect< float > *arg1 = 0 ;
-  Dali::Rect< float > *result = 0 ;
+  Dali::CameraActor result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  {
+    try {
+      result = Dali::CameraActor::New3DCamera();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::CameraActor((const Dali::CameraActor &)result);
+  return jresult;
+}
+
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor(void * jarg1) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::CameraActor *arg1 = 0 ;
+  Dali::CameraActor *result = 0 ;
+
+  arg1 = (Dali::CameraActor *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< float > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CameraActor const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Rect< float > *)new Dali::Rect< float >((Dali::Rect< float > const &)*arg1);
+      result = (Dali::CameraActor *)new Dali::CameraActor((Dali::CameraActor const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22016,21 +17017,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_2(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PaddingType_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  Dali::Rect< float > *arg2 = 0 ;
-  Dali::Rect< float > *result = 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::CameraActor *arg2 = 0 ;
+  Dali::CameraActor *result = 0 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (Dali::Rect< float > *)jarg2;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::CameraActor *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< float > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CameraActor const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Rect< float > *) &(arg1)->operator =((Dali::Rect< float > const &)*arg2);
+      result = (Dali::CameraActor *) &(arg1)->operator =((Dali::CameraActor const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22039,280 +17040,311 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PaddingType_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_Set(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float arg2 ;
-  float arg3 ;
-  float arg4 ;
-  float arg5 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetType(void * jarg1, int jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Camera::Type arg2 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg5;
-  arg5 = (float)jarg4;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::Camera::Type)jarg2;
   {
     try {
-      (arg1)->Set(arg2,arg3,arg4,arg5);
+      (arg1)->SetType(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_left_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->left = arg2;
-}
-
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetType(void * jarg1) {
+  int jresult ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Camera::Type result;
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_left_get(void * jarg1) {
-  float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float result;
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (Dali::Camera::Type)((Dali::CameraActor const *)arg1)->GetType();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->left);
-  jresult = result;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_start_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetProjectionMode(void * jarg1, int jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Camera::ProjectionMode arg2 ;
+
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::Camera::ProjectionMode)jarg2;
+  {
+    try {
+      (arg1)->SetProjectionMode(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->left = arg2;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_start_get(void * jarg1) {
-  float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetProjectionMode(void * jarg1) {
+  int jresult ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Camera::ProjectionMode result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->left);
-  jresult = result;
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (Dali::Camera::ProjectionMode)((Dali::CameraActor const *)arg1)->GetProjectionMode();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_right_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFieldOfView(void * jarg1, float jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->right = arg2;
+  {
+    try {
+      (arg1)->SetFieldOfView(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_right_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFieldOfView(void * jarg1) {
   float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->right);
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (float)(arg1)->GetFieldOfView();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_end_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetAspectRatio(void * jarg1, float jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->right = arg2;
+  {
+    try {
+      (arg1)->SetAspectRatio(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_end_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetAspectRatio(void * jarg1) {
   float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->right);
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (float)(arg1)->GetAspectRatio();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_bottom_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetNearClippingPlane(void * jarg1, float jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->bottom = arg2;
+  {
+    try {
+      (arg1)->SetNearClippingPlane(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_bottom_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetNearClippingPlane(void * jarg1) {
   float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->bottom);
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (float)(arg1)->GetNearClippingPlane();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_top_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFarClippingPlane(void * jarg1, float jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->top = arg2;
+  {
+    try {
+      (arg1)->SetFarClippingPlane(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_top_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFarClippingPlane(void * jarg1) {
   float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->top);
+  arg1 = (Dali::CameraActor *)jarg1;
+  {
+    try {
+      result = (float)(arg1)->GetFarClippingPlane();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PaddingType(void * jarg1) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetTargetPosition(void * jarg1, void * jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Vector3 *arg2 = 0 ;
 
-  arg1 = (Dali::Rect< float > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->SetTargetPosition((Dali::Vector3 const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorInteger_BaseType_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Vector< int >::BaseType;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorInteger__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_GetTargetPosition(void * jarg1) {
   void * jresult ;
-  Dali::Vector< int > *result = 0 ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Vector3 result;
 
+  arg1 = (Dali::CameraActor *)jarg1;
   {
     try {
-      result = (Dali::Vector< int > *)new Dali::Vector< int >();
+      result = ((Dali::CameraActor const *)arg1)->GetTargetPosition();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorInteger(void * jarg1) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetInvertYAxis(void * jarg1, bool jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  bool arg2 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = jarg2 ? true : false;
   {
     try {
-      delete arg1;
+      (arg1)->SetInvertYAxis(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorInteger__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< int > *arg1 = 0 ;
-  Dali::Vector< int > *result = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_CameraActor_GetInvertYAxis(void * jarg1) {
+  bool jresult ;
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< int > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::CameraActor *)jarg1;
   {
     try {
-      result = (Dali::Vector< int > *)new Dali::Vector< int >((Dali::Vector< int > const &)*arg1);
+      result = (bool)(arg1)->GetInvertYAxis();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int > *arg2 = 0 ;
-  Dali::Vector< int > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetPerspectiveProjection(void * jarg1, void * jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Size *arg2 = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int > *)jarg2;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::Size *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< int > const & type is null", 0);
-    return 0;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Vector< int > *) &(arg1)->operator =((Dali::Vector< int > const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetPerspectiveProjection((Dali::Size const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Begin(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetOrthographicProjection__SWIG_0(void * jarg1, void * jarg2) {
+  Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
+  Dali::Size *arg2 = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
+  arg1 = (Dali::CameraActor *)jarg1;
+  arg2 = (Dali::Size *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Size const & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (Dali::Vector< int >::Iterator)((Dali::Vector< int > const *)arg1)->Begin();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetOrthographicProjection((Dali::Size const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_0() {
   void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator result;
+  std::pair< std::string,Dali::Property::Value > *result = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
   {
     try {
-      result = (Dali::Vector< int >::Iterator)((Dali::Vector< int > const *)arg1)->End();
+      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22321,17 +17353,27 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_1(char * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::SizeType arg2 ;
-  Dali::Vector< int >::ItemType *result = 0 ;
+  std::string arg1 ;
+  Dali::Property::Value arg2 ;
+  Dali::Property::Value *argp2 ;
+  std::pair< std::string,Dali::Property::Value > *result = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::SizeType)jarg2;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  (&arg1)->assign(jarg1);
+  argp2 = (Dali::Property::Value *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Property::Value", 0);
+    return 0;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::Vector< int >::ItemType *) &(arg1)->operator [](arg2);
+      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22340,261 +17382,180 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_ValueOfIndex__SWIG_0(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_PushBack(void * jarg1, int jarg2) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::ItemType *arg2 = 0 ;
-  Dali::Vector< int >::ItemType temp2 ;
-
-  arg1 = (Dali::Vector< int > *)jarg1;
-  temp2 = (Dali::Vector< int >::ItemType)jarg2;
-  arg2 = &temp2;
-  {
-    try {
-      (arg1)->PushBack((Dali::Vector< int >::ItemType const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Insert__SWIG_0(void * jarg1, void * jarg2, int jarg3) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::ItemType *arg3 = 0 ;
-  Dali::Vector< int >::ItemType temp3 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_2(void * jarg1) {
+  void * jresult ;
+  std::pair< std::string,Dali::Property::Value > *arg1 = 0 ;
+  std::pair< std::string,Dali::Property::Value > *result = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::Iterator)jarg2;
-  temp3 = (Dali::Vector< int >::ItemType)jarg3;
-  arg3 = &temp3;
-  {
-    try {
-      (arg1)->Insert(arg2,(Dali::Vector< int >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< std::string,Dali::Property::Value > const & type is null", 0);
+    return 0;
   }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::Iterator arg3 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::Iterator arg4 = (Dali::Vector< int >::Iterator) 0 ;
-
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::Iterator)jarg2;
-  arg3 = (Dali::Vector< int >::Iterator)jarg3;
-  arg4 = (Dali::Vector< int >::Iterator)jarg4;
   {
     try {
-      (arg1)->Insert(arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION();
+      result = (std::pair< std::string,Dali::Property::Value > *)new std::pair< std::string,Dali::Property::Value >((std::pair< std::string,Dali::Property::Value > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Reserve(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::SizeType arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_first_set(void * jarg1, char * jarg2) {
+  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
+  std::string *arg2 = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Reserve(arg2);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
   }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  if (arg1) (arg1)->first = *arg2;
 
-}
+  //argout typemap for const std::string&
 
+}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::SizeType arg2 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Resize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_StringValuePair_first_get(void * jarg1) {
+  char * jresult ;
+  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
+  std::string *result = 0 ;
 
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
+  result = (std::string *) & ((arg1)->first);
+  jresult = SWIG_csharp_string_callback(result->c_str());
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Resize__SWIG_1(void * jarg1, unsigned long jarg2, int jarg3) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::SizeType arg2 ;
-  Dali::Vector< int >::ItemType *arg3 = 0 ;
-  Dali::Vector< int >::ItemType temp3 ;
-
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::SizeType)jarg2;
-  temp3 = (Dali::Vector< int >::ItemType)jarg3;
-  arg3 = &temp3;
-  {
-    try {
-      (arg1)->Resize(arg2,(Dali::Vector< int >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_second_set(void * jarg1, void * jarg2) {
+  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
+  Dali::Property::Value *arg2 = (Dali::Property::Value *) 0 ;
 
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
+  arg2 = (Dali::Property::Value *)jarg2;
+  if (arg1) (arg1)->second = *arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Erase__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StringValuePair_second_get(void * jarg1) {
   void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::Iterator result;
-
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::Iterator)jarg2;
-  {
-    try {
-      result = (Dali::Vector< int >::Iterator)(arg1)->Erase(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
+  Dali::Property::Value *result = 0 ;
 
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
+  result = (Dali::Property::Value *)& ((arg1)->second);
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::Iterator arg3 = (Dali::Vector< int >::Iterator) 0 ;
-  Dali::Vector< int >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StringValuePair(void * jarg1) {
+  std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::Iterator)jarg2;
-  arg3 = (Dali::Vector< int >::Iterator)jarg3;
+  arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1;
   {
     try {
-      result = (Dali::Vector< int >::Iterator)(arg1)->Erase(arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Remove(void * jarg1, void * jarg2) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Clear(void * jarg1) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int >::Iterator)jarg2;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      (arg1)->Remove(arg2);
+      (arg1)->clear();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Swap(void * jarg1, void * jarg2) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-  Dali::Vector< int > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Add(void * jarg1, void * jarg2) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  Dali::TouchPoint *arg2 = 0 ;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
-  arg2 = (Dali::Vector< int > *)jarg2;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (Dali::TouchPoint *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< int > & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
     return ;
   }
   {
     try {
-      (arg1)->Swap(*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Clear(void * jarg1) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
-
-  arg1 = (Dali::Vector< int > *)jarg1;
-  {
-    try {
-      (arg1)->Clear();
+      (arg1)->push_back((Dali::TouchPoint const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Release(void * jarg1) {
-  Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_size(void * jarg1) {
+  unsigned long jresult ;
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  std::vector< Dali::TouchPoint >::size_type result;
 
-  arg1 = (Dali::Vector< int > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      (arg1)->Release();
-    } CALL_CATCH_EXCEPTION();
+      result = ((std::vector< Dali::TouchPoint > const *)arg1)->size();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorFloat_BaseType_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Vector< float >::BaseType;
-  jresult = (int)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorFloat__SWIG_0() {
-  void * jresult ;
-  Dali::Vector< float > *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_capacity(void * jarg1) {
+  unsigned long jresult ;
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  std::vector< Dali::TouchPoint >::size_type result;
 
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      result = (Dali::Vector< float > *)new Dali::Vector< float >();
+      result = ((std::vector< Dali::TouchPoint > const *)arg1)->capacity();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorFloat(void * jarg1) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_reserve(void * jarg1, unsigned long jarg2) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  std::vector< Dali::TouchPoint >::size_type arg2 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (std::vector< Dali::TouchPoint >::size_type)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->reserve(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorFloat__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_0() {
   void * jresult ;
-  Dali::Vector< float > *arg1 = 0 ;
-  Dali::Vector< float > *result = 0 ;
+  std::vector< Dali::TouchPoint > *result = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< float > const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (Dali::Vector< float > *)new Dali::Vector< float >((Dali::Vector< float > const &)*arg1);
+      result = (std::vector< Dali::TouchPoint > *)new std::vector< Dali::TouchPoint >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22603,21 +17564,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorFloat__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float > *arg2 = 0 ;
-  Dali::Vector< float > *result = 0 ;
+  std::vector< Dali::TouchPoint > *arg1 = 0 ;
+  std::vector< Dali::TouchPoint > *result = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< float > const & type is null", 0);
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Vector< float > *) &(arg1)->operator =((Dali::Vector< float > const &)*arg2);
+      result = (std::vector< Dali::TouchPoint > *)new std::vector< Dali::TouchPoint >((std::vector< Dali::TouchPoint > const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22626,15 +17585,22 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Begin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_2(int jarg1) {
   void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator result;
+  int arg1 ;
+  std::vector< Dali::TouchPoint > *result = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
+  arg1 = (int)jarg1;
   {
     try {
-      result = (Dali::Vector< float >::Iterator)((Dali::Vector< float > const *)arg1)->Begin();
+      try {
+        result = (std::vector< Dali::TouchPoint > *)new_std_vector_Sl_Dali_TouchPoint_Sg___SWIG_2(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22643,34 +17609,50 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Begin(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitemcopy(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator result;
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  SwigValueWrapper< Dali::TouchPoint > result;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      result = (Dali::Vector< float >::Iterator)((Dali::Vector< float > const *)arg1)->End();
+      try {
+        result = std_vector_Sl_Dali_TouchPoint_Sg__getitemcopy(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::TouchPoint((const Dali::TouchPoint &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitem(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::SizeType arg2 ;
-  Dali::Vector< float >::ItemType *result = 0 ;
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  Dali::TouchPoint *result = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::SizeType)jarg2;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      result = (Dali::Vector< float >::ItemType *) &(arg1)->operator [](arg2);
+      try {
+        result = (Dali::TouchPoint *) &std_vector_Sl_Dali_TouchPoint_Sg__getitem(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22679,146 +17661,77 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_ValueOfIndex__SWIG_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_PushBack(void * jarg1, float jarg2) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::ItemType *arg2 = 0 ;
-  Dali::Vector< float >::ItemType temp2 ;
-
-  arg1 = (Dali::Vector< float > *)jarg1;
-  temp2 = (Dali::Vector< float >::ItemType)jarg2;
-  arg2 = &temp2;
-  {
-    try {
-      (arg1)->PushBack((Dali::Vector< float >::ItemType const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Insert__SWIG_0(void * jarg1, void * jarg2, float jarg3) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::ItemType *arg3 = 0 ;
-  Dali::Vector< float >::ItemType temp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  Dali::TouchPoint *arg3 = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::Iterator)jarg2;
-  temp3 = (Dali::Vector< float >::ItemType)jarg3;
-  arg3 = &temp3;
-  {
-    try {
-      (arg1)->Insert(arg2,(Dali::Vector< float >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (Dali::TouchPoint *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
+    return ;
   }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::Iterator arg3 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::Iterator arg4 = (Dali::Vector< float >::Iterator) 0 ;
-
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::Iterator)jarg2;
-  arg3 = (Dali::Vector< float >::Iterator)jarg3;
-  arg4 = (Dali::Vector< float >::Iterator)jarg4;
   {
     try {
-      (arg1)->Insert(arg2,arg3,arg4);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Reserve(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::SizeType arg2 ;
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__setitem(arg1,arg2,(Dali::TouchPoint const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Reserve(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
-//// ========================= end of part 2 =============================
-
-//// ========================== start part 3 ===============================
-
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::SizeType arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_AddRange(void * jarg1, void * jarg2) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  std::vector< Dali::TouchPoint > *arg2 = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Resize(arg2);
-    } CALL_CATCH_EXCEPTION();
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (std::vector< Dali::TouchPoint > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
+    return ;
   }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Resize__SWIG_1(void * jarg1, unsigned long jarg2, float jarg3) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::SizeType arg2 ;
-  Dali::Vector< float >::ItemType *arg3 = 0 ;
-  Dali::Vector< float >::ItemType temp3 ;
-
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::SizeType)jarg2;
-  temp3 = (Dali::Vector< float >::ItemType)jarg3;
-  arg3 = &temp3;
   {
     try {
-      (arg1)->Resize(arg2,(Dali::Vector< float >::ItemType const &)*arg3);
+      std_vector_Sl_Dali_TouchPoint_Sg__AddRange(arg1,(std::vector< Dali::TouchPoint > const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Erase__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::Iterator result;
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  std::vector< Dali::TouchPoint > *result = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::Iterator)jarg2;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (Dali::Vector< float >::Iterator)(arg1)->Erase(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::Iterator arg3 = (Dali::Vector< float >::Iterator) 0 ;
-  Dali::Vector< float >::Iterator result;
+      try {
+        result = (std::vector< Dali::TouchPoint > *)std_vector_Sl_Dali_TouchPoint_Sg__GetRange(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return 0;
+      }
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::Iterator)jarg2;
-  arg3 = (Dali::Vector< float >::Iterator)jarg3;
-  {
-    try {
-      result = (Dali::Vector< float >::Iterator)(arg1)->Erase(arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22827,83 +17740,134 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Erase__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Remove(void * jarg1, void * jarg2) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  Dali::TouchPoint *arg3 = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float >::Iterator)jarg2;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (Dali::TouchPoint *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
+    return ;
+  }
   {
     try {
-      (arg1)->Remove(arg2);
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__Insert(arg1,arg2,(Dali::TouchPoint const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Swap(void * jarg1, void * jarg2) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
-  Dali::Vector< float > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  std::vector< Dali::TouchPoint > *arg3 = 0 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
-  arg2 = (Dali::Vector< float > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< float > & type is null", 0);
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (std::vector< Dali::TouchPoint > *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
     return ;
   }
   {
     try {
-      (arg1)->Swap(*arg2);
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__InsertRange(arg1,arg2,(std::vector< Dali::TouchPoint > const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Clear(void * jarg1) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveAt(void * jarg1, int jarg2) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      (arg1)->Clear();
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__RemoveAt(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Release(void * jarg1) {
-  Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  int arg3 ;
 
-  arg1 = (Dali::Vector< float > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      (arg1)->Release();
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__RemoveRange(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return ;
+      }
+
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_BaseType_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Vector< unsigned char >::BaseType;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_Repeat(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Vector< unsigned char > *result = 0 ;
+  Dali::TouchPoint *arg1 = 0 ;
+  int arg2 ;
+  std::vector< Dali::TouchPoint > *result = 0 ;
 
+  arg1 = (Dali::TouchPoint *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint const & type is null", 0);
+    return 0;
+  }
+  arg2 = (int)jarg2;
   {
     try {
-      result = (Dali::Vector< unsigned char > *)new Dali::Vector< unsigned char >();
+      try {
+        result = (std::vector< Dali::TouchPoint > *)std_vector_Sl_Dali_TouchPoint_Sg__Repeat((Dali::TouchPoint const &)*arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -22912,89 +17876,95 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUnsignedChar(void * jarg1) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_0(void * jarg1) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      delete arg1;
+      std_vector_Sl_Dali_TouchPoint_Sg__Reverse__SWIG_0(arg1);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = 0 ;
-  Dali::Vector< unsigned char > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  int arg3 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (Dali::Vector< unsigned char > *)new Dali::Vector< unsigned char >((Dali::Vector< unsigned char > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return ;
+      }
+
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char > *arg2 = 0 ;
-  Dali::Vector< unsigned char > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
+  int arg2 ;
+  std::vector< Dali::TouchPoint > *arg3 = 0 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > const & type is null", 0);
-    return 0;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (std::vector< Dali::TouchPoint > *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::TouchPoint > const & type is null", 0);
+    return ;
   }
   {
     try {
-      result = (Dali::Vector< unsigned char > *) &(arg1)->operator =((Dali::Vector< unsigned char > const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      try {
+        std_vector_Sl_Dali_TouchPoint_Sg__SetRange(arg1,arg2,(std::vector< Dali::TouchPoint > const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Begin(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPointContainer(void * jarg1) {
+  std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg1 = (std::vector< Dali::TouchPoint > *)jarg1;
   {
     try {
-      result = (Dali::Vector< unsigned char >::Iterator)((Dali::Vector< unsigned char > const *)arg1)->Begin();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_0() {
   void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator result;
+  Dali::Rect< int > *result = 0 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      result = (Dali::Vector< unsigned char >::Iterator)((Dali::Vector< unsigned char > const *)arg1)->End();
+      result = (Dali::Rect< int > *)new Dali::Rect< int >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -23003,17 +17973,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4) {
   void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::SizeType arg2 ;
-  Dali::Vector< unsigned char >::ItemType *result = 0 ;
+  int arg1 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  Dali::Rect< int > *result = 0 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
+  arg1 = (int)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
+  arg4 = (int)jarg4;
   {
     try {
-      result = (Dali::Vector< unsigned char >::ItemType *) &(arg1)->operator [](arg2);
+      result = (Dali::Rect< int > *)new Dali::Rect< int >(arg1,arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -23022,584 +17996,582 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_ValueOfIndex__SWIG_
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_PushBack(void * jarg1, unsigned char jarg2) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::ItemType *arg2 = 0 ;
-  Dali::Vector< unsigned char >::ItemType temp2 ;
-
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  temp2 = (Dali::Vector< unsigned char >::ItemType)jarg2;
-  arg2 = &temp2;
-  {
-    try {
-      (arg1)->PushBack((Dali::Vector< unsigned char >::ItemType const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_0(void * jarg1, unsigned char* jarg2, unsigned char jarg3) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
-  Dali::Vector< unsigned char >::ItemType temp3 ;
-
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = jarg2;
-  temp3 = (Dali::Vector< unsigned char >::ItemType)jarg3;
-  arg3 = &temp3;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Rectangle__SWIG_2(void * jarg1) {
+  void * jresult ;
+  Dali::Rect< int > *arg1 = 0 ;
+  Dali::Rect< int > *result = 0 ;
+
+  arg1 = (Dali::Rect< int > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->Insert(arg2,(Dali::Vector< unsigned char >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Rect< int > *)new Dali::Rect< int >((Dali::Rect< int > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
+}
 
 
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3, void * jarg4) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg3 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg4 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_Set(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = jarg2;
-  arg3 = (Dali::Vector< unsigned char >::Iterator)jarg3;
-  arg4 = (Dali::Vector< unsigned char >::Iterator)jarg4;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
+  arg4 = (int)jarg4;
+  arg5 = (int)jarg5;
   {
     try {
-      (arg1)->Insert(arg2,arg3,arg4);
+      (arg1)->Set(arg2,arg3,arg4,arg5);
     } CALL_CATCH_EXCEPTION();
   }
 
-
-
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Reserve(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::SizeType arg2 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_IsEmpty(void * jarg1) {
+  bool jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      (arg1)->Reserve(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Rect< int > const *)arg1)->IsEmpty();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::SizeType arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Left(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      (arg1)->Resize(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (int)((Dali::Rect< int > const *)arg1)->Left();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_1(void * jarg1, unsigned long jarg2, unsigned char jarg3) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::SizeType arg2 ;
-  Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
-  Dali::Vector< unsigned char >::ItemType temp3 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Right(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
-  temp3 = (Dali::Vector< unsigned char >::ItemType)jarg3;
-  arg3 = &temp3;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      (arg1)->Resize(arg2,(Dali::Vector< unsigned char >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (int)((Dali::Rect< int > const *)arg1)->Right();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_0(void * jarg1, unsigned char* jarg2) {
-  void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::Iterator result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Top(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = jarg2;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      result = (Dali::Vector< unsigned char >::Iterator)(arg1)->Erase(arg2);
+      result = (int)((Dali::Rect< int > const *)arg1)->Top();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg3 = (Dali::Vector< unsigned char >::Iterator) 0 ;
-  Dali::Vector< unsigned char >::Iterator result;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Bottom(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = jarg2;
-  arg3 = (Dali::Vector< unsigned char >::Iterator)jarg3;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      result = (Dali::Vector< unsigned char >::Iterator)(arg1)->Erase(arg2,arg3);
+      result = (int)((Dali::Rect< int > const *)arg1)->Bottom();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-
-
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Remove(void * jarg1, unsigned char* jarg2) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_Area(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = jarg2;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      (arg1)->Remove(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (int)((Dali::Rect< int > const *)arg1)->Area();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
-
-
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Swap(void * jarg1, void * jarg2) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
-  Dali::Vector< unsigned char > *arg2 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_Intersects(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  Dali::Rect< int > *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  arg2 = (Dali::Vector< unsigned char > *)jarg2;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (Dali::Rect< int > *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > & type is null", 0);
-    return ;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
+    return 0;
   }
   {
     try {
-      (arg1)->Swap(*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Rect< int > const *)arg1)->Intersects((Dali::Rect< int > const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Clear(void * jarg1) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Rectangle_Contains(void * jarg1, void * jarg2) {
+  bool jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  Dali::Rect< int > *arg2 = 0 ;
+  bool result;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (Dali::Rect< int > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->Clear();
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)((Dali::Rect< int > const *)arg1)->Contains((Dali::Rect< int > const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Release(void * jarg1) {
-  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_x_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::Vector< unsigned char > *)jarg1;
-  {
-    try {
-      (arg1)->Release();
-    } CALL_CATCH_EXCEPTION();
-  }
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->x = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_x_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->x);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUint16Pair_BaseType_get() {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_left_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
+
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->left = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_left_get(void * jarg1) {
   int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
 
-  result = (int)Dali::Vector< Dali::Uint16Pair >::BaseType;
-  jresult = (int)result;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->left);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_0() {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_y_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair > *)new Dali::Vector< Dali::Uint16Pair >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->y = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_y_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
+
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->y);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUint16Pair(void * jarg1) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_right_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->right = arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = 0 ;
-  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair > *)new Dali::Vector< Dali::Uint16Pair >((Dali::Vector< Dali::Uint16Pair > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_right_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  jresult = (void *)result;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->right);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
-  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair > *) &(arg1)->operator =((Dali::Vector< Dali::Uint16Pair > const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_width_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
-  jresult = (void *)result;
-  return jresult;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->width = arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Begin(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator result;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)((Dali::Vector< Dali::Uint16Pair > const *)arg1)->Begin();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_width_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
-  jresult = (void *)result;
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->width);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_End(void * jarg1) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_bottom_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)((Dali::Vector< Dali::Uint16Pair > const *)arg1)->End();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->bottom = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_bottom_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
+
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->bottom);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
-  Dali::Vector< Dali::Uint16Pair >::ItemType *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_height_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair >::ItemType *) &(arg1)->operator [](arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->height = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_height_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
+
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->height);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_PushBack(void * jarg1, void * jarg2) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::ItemType *arg2 = 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->PushBack((Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Rectangle_top_set(void * jarg1, int jarg2) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int arg2 ;
 
+  arg1 = (Dali::Rect< int > *)jarg1;
+  arg2 = (int)jarg2;
+  if (arg1) (arg1)->top = arg2;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
-  arg3 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->Insert(arg2,(Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Rectangle_top_get(void * jarg1) {
+  int jresult ;
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
+  int result;
 
+  arg1 = (Dali::Rect< int > *)jarg1;
+  result = (int) ((arg1)->top);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg4 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Rectangle(void * jarg1) {
+  Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
-  arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg3;
-  arg4 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg4;
+  arg1 = (Dali::Rect< int > *)jarg1;
   {
     try {
-      (arg1)->Insert(arg2,arg3,arg4);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Reserve(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_0() {
+  void * jresult ;
+  Dali::Rect< float > *result = 0 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
   {
     try {
-      (arg1)->Reserve(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Rect< float > *)new Dali::Rect< float >();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+  void * jresult ;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  Dali::Rect< float > *result = 0 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
+  arg1 = (float)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg4;
+  arg4 = (float)jarg3;
   {
     try {
-      (arg1)->Resize(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Rect< float > *)new Dali::Rect< float >(arg1,arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
-  Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_Set(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
-  arg3 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  arg3 = (float)jarg3;
+  arg4 = (float)jarg5;
+  arg5 = (float)jarg4;
   {
     try {
-      (arg1)->Resize(arg2,(Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg3);
+      (arg1)->Set(arg2,arg3,arg4,arg5);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_0(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_left_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)(arg1)->Erase(arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->left = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_left_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
+
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->left);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_start_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
-  arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg3;
-  {
-    try {
-      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)(arg1)->Erase(arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->left = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_start_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
+
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->left);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Remove(void * jarg1, void * jarg2) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
-  {
-    try {
-      (arg1)->Remove(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_right_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->right = arg2;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Swap(void * jarg1, void * jarg2) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
-  Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
-
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  arg2 = (Dali::Vector< Dali::Uint16Pair > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->Swap(*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_right_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
 
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->right);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Clear(void * jarg1) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_end_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  {
-    try {
-      (arg1)->Clear();
-    } CALL_CATCH_EXCEPTION();
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->right = arg2;
+}
+
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_end_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
 
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->right);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Release(void * jarg1) {
-  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_bottom_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
-  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
-  {
-    try {
-      (arg1)->Release();
-    } CALL_CATCH_EXCEPTION();
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->bottom = arg2;
+}
+
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_bottom_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
 
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->bottom);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VoidSignal() {
-  void * jresult ;
-  Dali::Signal< void () > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_top_set(void * jarg1, float jarg2) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float arg2 ;
 
-  {
-    try {
-      result = (Dali::Signal< void () > *)new Dali::Signal< void () >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+  arg1 = (Dali::Rect< float > *)jarg1;
+  arg2 = (float)jarg2;
+  if (arg1) (arg1)->top = arg2;
+}
 
-  jresult = (void *)result;
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_top_get(void * jarg1) {
+  float jresult ;
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
+  float result;
+
+  arg1 = (Dali::Rect< float > *)jarg1;
+  result = (float) ((arg1)->top);
+  jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VoidSignal(void * jarg1) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PaddingType(void * jarg1) {
+  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
+  arg1 = (Dali::Rect< float > *)jarg1;
   {
     try {
       delete arg1;
@@ -23608,411 +18580,450 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VoidSignal(void * jarg1) {
 
 }
 
+//// ========================= end of part 2 =============================
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_VoidSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  bool result;
+//// ========================== start part 3 ===============================
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::Signal< void () > const *)arg1)->Empty();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_BaseType_get() {
+  int jresult ;
+  int result;
 
-  jresult = result;
+  result = (int)Dali::Vector< unsigned char >::BaseType;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VoidSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_0() {
+  void * jresult ;
+  Dali::Vector< unsigned char > *result = 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
   {
     try {
-      result = ((Dali::Signal< void () > const *)arg1)->GetConnectionCount();
+      result = (Dali::Vector< unsigned char > *)new Dali::Vector< unsigned char >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  void (*arg2)() = (void (*)()) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUnsignedChar(void * jarg1) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (void (*)())jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      (arg1)->Connect(arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  void (*arg2)() = (void (*)()) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = 0 ;
+  Dali::Vector< unsigned char > *result = 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (void (*)())jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->Disconnect(arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< unsigned char > *)new Dali::Vector< unsigned char >((Dali::Vector< unsigned char > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
-  Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
-
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (Dali::ConnectionTrackerInterface *)jarg2;
-  arg3 = (Dali::FunctorDelegate *)jarg3;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Assign(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char > *arg2 = 0 ;
+  Dali::Vector< unsigned char > *result = 0 ;
+
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      (arg1)->Connect(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< unsigned char > *) &(arg1)->operator =((Dali::Vector< unsigned char > const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Emit(void * jarg1) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Begin(void * jarg1) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator result;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      (arg1)->Emit();
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< unsigned char >::Iterator)((Dali::Vector< unsigned char > const *)arg1)->Begin();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FloatSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_End(void * jarg1) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator result;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_float_SP__Sg__Empty((Dali::Signal< void (float) > const *)arg1);
+      result = (Dali::Vector< unsigned char >::Iterator)((Dali::Vector< unsigned char > const *)arg1)->End();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_FloatSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::SizeType arg2 ;
+  Dali::Vector< unsigned char >::ItemType *result = 0 ;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_float_SP__Sg__GetConnectionCount((Dali::Signal< void (float) > const *)arg1);
+      result = (Dali::Vector< unsigned char >::ItemType *) &(arg1)->operator [](arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
-  void (*arg2)(float) = (void (*)(float)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_PushBack(void * jarg1, unsigned char jarg2) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::ItemType *arg2 = 0 ;
+  Dali::Vector< unsigned char >::ItemType temp2 ;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
-  arg2 = (void (*)(float))jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  temp2 = (Dali::Vector< unsigned char >::ItemType)jarg2;
+  arg2 = &temp2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_float_SP__Sg__Connect(arg1,arg2);
+      (arg1)->PushBack((Dali::Vector< unsigned char >::ItemType const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
-  void (*arg2)(float) = (void (*)(float)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_0(void * jarg1, unsigned char* jarg2, unsigned char jarg3) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
+  Dali::Vector< unsigned char >::ItemType temp3 ;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
-  arg2 = (void (*)(float))jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = jarg2;
+  temp3 = (Dali::Vector< unsigned char >::ItemType)jarg3;
+  arg3 = &temp3;
   {
     try {
-      Dali_Signal_Sl_void_Sp_float_SP__Sg__Disconnect(arg1,arg2);
+      (arg1)->Insert(arg2,(Dali::Vector< unsigned char >::ItemType const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
+
+
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Emit(void * jarg1, float jarg2) {
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
-  float arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3, void * jarg4) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg3 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg4 = (Dali::Vector< unsigned char >::Iterator) 0 ;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
-  arg2 = (float)jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = jarg2;
+  arg3 = (Dali::Vector< unsigned char >::Iterator)jarg3;
+  arg4 = (Dali::Vector< unsigned char >::Iterator)jarg4;
   {
     try {
-      Dali_Signal_Sl_void_Sp_float_SP__Sg__Emit(arg1,arg2);
+      (arg1)->Insert(arg2,arg3,arg4);
     } CALL_CATCH_EXCEPTION();
   }
 
+
+
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FloatSignal() {
-  void * jresult ;
-  Dali::Signal< void (float) > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Reserve(void * jarg1, unsigned long jarg2) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::SizeType arg2 ;
 
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
   {
     try {
-      result = (Dali::Signal< void (float) > *)new Dali::Signal< void (float) >();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Reserve(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FloatSignal(void * jarg1) {
-  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::SizeType arg2 ;
 
-  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
   {
     try {
-      delete arg1;
+      (arg1)->Resize(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_1(void * jarg1, unsigned long jarg2, unsigned char jarg3) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::SizeType arg2 ;
+  Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
+  Dali::Vector< unsigned char >::ItemType temp3 ;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char >::SizeType)jarg2;
+  temp3 = (Dali::Vector< unsigned char >::ItemType)jarg3;
+  arg3 = &temp3;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Empty((Dali::Signal< void (Dali::BaseHandle) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Resize(arg2,(Dali::Vector< unsigned char >::ItemType const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_0(void * jarg1, unsigned char* jarg2) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::Iterator result;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = jarg2;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::BaseHandle) > const *)arg1);
+      result = (Dali::Vector< unsigned char >::Iterator)(arg1)->Erase(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
+
+
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
-  void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg3 = (Dali::Vector< unsigned char >::Iterator) 0 ;
+  Dali::Vector< unsigned char >::Iterator result;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
-  arg2 = (void (*)(Dali::BaseHandle))jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = jarg2;
+  arg3 = (Dali::Vector< unsigned char >::Iterator)jarg3;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Connect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< unsigned char >::Iterator)(arg1)->Erase(arg2,arg3);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+
+
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
-  void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Remove(void * jarg1, unsigned char* jarg2) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
-  arg2 = (void (*)(Dali::BaseHandle))jarg2;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Disconnect(arg1,arg2);
+      (arg1)->Remove(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
+
+
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
-  Dali::BaseHandle arg2 ;
-  Dali::BaseHandle *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Swap(void * jarg1, void * jarg2) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
+  Dali::Vector< unsigned char > *arg2 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
-  argp2 = (Dali::BaseHandle *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
+  arg2 = (Dali::Vector< unsigned char > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< unsigned char > & type is null", 0);
     return ;
   }
-  arg2 = *argp2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Emit(arg1,arg2);
+      (arg1)->Swap(*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectCreatedSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::BaseHandle) > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Clear(void * jarg1) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
 
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      result = (Dali::Signal< void (Dali::BaseHandle) > *)new Dali::Signal< void (Dali::BaseHandle) >();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Clear();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectCreatedSignal(void * jarg1) {
-  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Release(void * jarg1) {
+  Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  arg1 = (Dali::Vector< unsigned char > *)jarg1;
   {
     try {
-      delete arg1;
+      (arg1)->Release();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Empty((Dali::Signal< void (Dali::PropertyNotification &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUint16Pair_BaseType_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Vector< Dali::Uint16Pair >::BaseType;
+  jresult = (int)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_0() {
+  void * jresult ;
+  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::PropertyNotification &) > const *)arg1);
+      result = (Dali::Vector< Dali::Uint16Pair > *)new Dali::Vector< Dali::Uint16Pair >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
-  void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUint16Pair(void * jarg1) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
-  arg2 = (void (*)(Dali::PropertyNotification &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Connect(arg1,arg2);
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
-  void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = 0 ;
+  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
-  arg2 = (void (*)(Dali::PropertyNotification &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Disconnect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< Dali::Uint16Pair > *)new Dali::Vector< Dali::Uint16Pair >((Dali::Vector< Dali::Uint16Pair > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
-  Dali::PropertyNotification *arg2 = 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Assign(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
+  Dali::Vector< Dali::Uint16Pair > *result = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
-  arg2 = (Dali::PropertyNotification *)jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair > *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification & type is null", 0);
-    return ;
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > const & type is null", 0);
+    return 0;
   }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Emit(arg1,*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< Dali::Uint16Pair > *) &(arg1)->operator =((Dali::Vector< Dali::Uint16Pair > const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotifySignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Begin(void * jarg1) {
   void * jresult ;
-  Dali::Signal< void (Dali::PropertyNotification &) > *result = 0 ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator result;
 
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
   {
     try {
-      result = (Dali::Signal< void (Dali::PropertyNotification &) > *)new Dali::Signal< void (Dali::PropertyNotification &) >();
+      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)((Dali::Vector< Dali::Uint16Pair > const *)arg1)->Begin();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24021,26 +19032,34 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotifySignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotifySignal(void * jarg1) {
-  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_End(void * jarg1) {
+  void * jresult ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator result;
 
-  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)((Dali::Vector< Dali::Uint16Pair > const *)arg1)->End();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
-  Dali::Signal< void (Dali::RenderTask &) > *result = 0 ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
+  Dali::Vector< Dali::Uint16Pair >::ItemType *result = 0 ;
 
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
   {
     try {
-      result = (Dali::Signal< void (Dali::RenderTask &) > *)new Dali::Signal< void (Dali::RenderTask &) >();
+      result = (Dali::Vector< Dali::Uint16Pair >::ItemType *) &(arg1)->operator [](arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24049,117 +19068,127 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskSignal(void * jarg1) {
-  Dali::Signal< void (Dali::RenderTask &) > *arg1 = (Dali::Signal< void (Dali::RenderTask &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_PushBack(void * jarg1, void * jarg2) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::ItemType *arg2 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::RenderTask &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
+    return ;
+  }
   {
     try {
-      delete arg1;
+      (arg1)->PushBack((Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
+  arg3 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Insert(arg2,(Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg4 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
+  arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg3;
+  arg4 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg4;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Insert(arg2,arg3,arg4);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Reserve(void * jarg1, unsigned long jarg2) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::LongPressGesture const &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      (arg1)->Reserve(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::LongPressGesture const &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      (arg1)->Resize(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::LongPressGesture *arg3 = 0 ;
-  Dali::Actor *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
+  Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::LongPressGesture *)jarg3;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::SizeType)jarg2;
+  arg3 = (Dali::Vector< Dali::Uint16Pair >::ItemType *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGesture const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair >::ItemType const & type is null", 0);
     return ;
   }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::LongPressGesture const &)*arg3);
+      (arg1)->Resize(arg2,(Dali::Vector< Dali::Uint16Pair >::ItemType const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *result = 0 ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator result;
 
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
   {
     try {
-      result = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) >();
+      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)(arg1)->Erase(arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24168,109 +19197,94 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetectedSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_KeyEventSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator result;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
+  arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg3;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::KeyEvent const &) > const *)arg1);
+      result = (Dali::Vector< Dali::Uint16Pair >::Iterator)(arg1)->Erase(arg2,arg3);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_KeyEventSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Remove(void * jarg1, void * jarg2) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator)jarg2;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::KeyEvent const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Remove(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
-  void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Swap(void * jarg1, void * jarg2) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
+  Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::KeyEvent const &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
+  arg2 = (Dali::Vector< Dali::Uint16Pair > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< Dali::Uint16Pair > & type is null", 0);
+    return ;
+  }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      (arg1)->Swap(*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
-  void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Clear(void * jarg1) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::KeyEvent const &))jarg2;
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      (arg1)->Clear();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
-  Dali::KeyEvent *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Release(void * jarg1) {
+  Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
-  arg2 = (Dali::KeyEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Emit(arg1,(Dali::KeyEvent const &)*arg2);
+      (arg1)->Release();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VoidSignal() {
   void * jresult ;
-  Dali::Signal< void (Dali::KeyEvent const &) > *result = 0 ;
+  Dali::Signal< void () > *result = 0 ;
 
   {
     try {
-      result = (Dali::Signal< void (Dali::KeyEvent const &) > *)new Dali::Signal< void (Dali::KeyEvent const &) >();
+      result = (Dali::Signal< void () > *)new Dali::Signal< void () >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24279,10 +19293,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyEventSignal(void * jarg1) {
-  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VoidSignal(void * jarg1) {
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg1 = (Dali::Signal< void () > *)jarg1;
   {
     try {
       delete arg1;
@@ -24291,15 +19305,16 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyEventSignal(void * jarg1) {
 
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_StageWheelSignal_Empty(void * jarg1) {
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_VoidSignal_Empty(void * jarg1) {
   bool jresult ;
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   bool result;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg1 = (Dali::Signal< void () > *)jarg1;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::WheelEvent const &) > const *)arg1);
+      result = (bool)((Dali::Signal< void () > const *)arg1)->Empty();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24308,15 +19323,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_StageWheelSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_StageWheelSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VoidSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   std::size_t result;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg1 = (Dali::Signal< void () > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::WheelEvent const &) > const *)arg1);
+      result = ((Dali::Signal< void () > const *)arg1)->GetConnectionCount();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24325,198 +19340,164 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_StageWheelSignal_GetConnectionC
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
-  void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
+  void (*arg2)() = (void (*)()) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::WheelEvent const &))jarg2;
+  arg1 = (Dali::Signal< void () > *)jarg1;
+  arg2 = (void (*)())jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      (arg1)->Connect(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
-  void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
+  void (*arg2)() = (void (*)()) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::WheelEvent const &))jarg2;
+  arg1 = (Dali::Signal< void () > *)jarg1;
+  arg2 = (void (*)())jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      (arg1)->Disconnect(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
-  Dali::WheelEvent *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
+  Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
+  Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
-  arg2 = (Dali::WheelEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::Signal< void () > *)jarg1;
+  arg2 = (Dali::ConnectionTrackerInterface *)jarg2;
+  arg3 = (Dali::FunctorDelegate *)jarg3;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Emit(arg1,(Dali::WheelEvent const &)*arg2);
+      (arg1)->Connect(arg2,arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StageWheelSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::WheelEvent const &) > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Emit(void * jarg1) {
+  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
 
+  arg1 = (Dali::Signal< void () > *)jarg1;
   {
     try {
-      result = (Dali::Signal< void (Dali::WheelEvent const &) > *)new Dali::Signal< void (Dali::WheelEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->Emit();
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StageWheelSignal(void * jarg1) {
-  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FloatSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)Dali_Signal_Sl_void_Sp_float_SP__Sg__Empty((Dali::Signal< void (float) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_0() {
-  void * jresult ;
-  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_FloatSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+  std::size_t result;
 
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
   {
     try {
-      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >();
+      result = Dali_Signal_Sl_void_Sp_float_SP__Sg__GetConnectionCount((Dali::Signal< void (float) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Radian arg1 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp1 ;
-  Dali::Radian *argp2 ;
-  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+  void (*arg2)(float) = (void (*)(float)) 0 ;
 
-  argp1 = (Dali::Radian *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg2 = (void (*)(float))jarg2;
   {
     try {
-      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      Dali_Signal_Sl_void_Sp_float_SP__Sg__Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_2(void * jarg1) {
-  void * jresult ;
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = 0 ;
-  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+  void (*arg2)(float) = (void (*)(float)) 0 ;
 
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< Dali::Radian,Dali::Radian > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg2 = (void (*)(float))jarg2;
   {
     try {
-      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >((std::pair< Dali::Radian,Dali::Radian > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      Dali_Signal_Sl_void_Sp_float_SP__Sg__Disconnect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_set(void * jarg1, void * jarg2) {
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
-  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
-
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
-  arg2 = (Dali::Radian *)jarg2;
-  if (arg1) (arg1)->first = *arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_get(void * jarg1) {
-  void * jresult ;
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
-  Dali::Radian *result = 0 ;
-
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
-  result = (Dali::Radian *)& ((arg1)->first);
-  jresult = (void *)result;
-  return jresult;
-}
-
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Emit(void * jarg1, float jarg2) {
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
+  float arg2 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_set(void * jarg1, void * jarg2) {
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
-  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
+  arg2 = (float)jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_float_SP__Sg__Emit(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
-  arg2 = (Dali::Radian *)jarg2;
-  if (arg1) (arg1)->second = *arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FloatSignal() {
   void * jresult ;
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
-  Dali::Radian *result = 0 ;
+  Dali::Signal< void (float) > *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Signal< void (float) > *)new Dali::Signal< void (float) >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
-  result = (Dali::Radian *)& ((arg1)->second);
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleThresholdPair(void * jarg1) {
-  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FloatSignal(void * jarg1) {
+  Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
 
-  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  arg1 = (Dali::Signal< void (float) > *)jarg1;
   {
     try {
       delete arg1;
@@ -24526,15 +19507,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleThresholdPair(void * jarg1)
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Empty(void * jarg1) {
   bool jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   bool result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > const *)arg1);
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Empty((Dali::Signal< void (Dali::BaseHandle) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24543,15 +19524,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Empty(void * ja
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   std::size_t result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > const *)arg1);
+      result = Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::BaseHandle) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24560,70 +19541,64 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_GetCon
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
+  void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::PanGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  arg2 = (void (*)(Dali::BaseHandle))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Connect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
+  void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::PanGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  arg2 = (void (*)(Dali::BaseHandle))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::PanGesture *arg3 = 0 ;
-  Dali::Actor *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Emit(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
+  Dali::BaseHandle arg2 ;
+  Dali::BaseHandle *argp2 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
+  argp2 = (Dali::BaseHandle *)jarg2;
   if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
     return ;
   }
   arg2 = *argp2;
-  arg3 = (Dali::PanGesture *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
-    return ;
-  }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::PanGesture const &)*arg3);
+      Dali_Signal_Sl_void_Sp_Dali_BaseHandle_SP__Sg__Emit(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectCreatedSignal() {
   void * jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *result = 0 ;
+  Dali::Signal< void (Dali::BaseHandle) > *result = 0 ;
 
   {
     try {
-      result = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) >();
+      result = (Dali::Signal< void (Dali::BaseHandle) > *)new Dali::Signal< void (Dali::BaseHandle) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24632,10 +19607,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetectedSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectCreatedSignal(void * jarg1) {
+  Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1;
   {
     try {
       delete arg1;
@@ -24645,15 +19620,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetectedSignal(void * j
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Empty(void * jarg1) {
   bool jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   bool result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > const *)arg1);
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Empty((Dali::Signal< void (Dali::PropertyNotification &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24662,15 +19637,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   std::size_t result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > const *)arg1);
+      result = Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::PropertyNotification &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24679,70 +19654,90 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_GetC
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
+  void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::PinchGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
+  arg2 = (void (*)(Dali::PropertyNotification &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Connect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
+  void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::PinchGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
+  arg2 = (void (*)(Dali::PropertyNotification &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::PinchGesture *arg3 = 0 ;
-  Dali::Actor *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Emit(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
+  Dali::PropertyNotification *arg2 = 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
+  arg2 = (Dali::PropertyNotification *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PropertyNotification & type is null", 0);
     return ;
   }
-  arg2 = *argp2;
-  arg3 = (Dali::PinchGesture *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGesture const & type is null", 0);
-    return ;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_PropertyNotification_SA__SP__Sg__Emit(arg1,*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotifySignal() {
+  void * jresult ;
+  Dali::Signal< void (Dali::PropertyNotification &) > *result = 0 ;
+
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::PinchGesture const &)*arg3);
+      result = (Dali::Signal< void (Dali::PropertyNotification &) > *)new Dali::Signal< void (Dali::PropertyNotification &) >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotifySignal(void * jarg1) {
+  Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1;
+  {
+    try {
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskSignal() {
   void * jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *result = 0 ;
+  Dali::Signal< void (Dali::RenderTask &) > *result = 0 ;
 
   {
     try {
-      result = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) >();
+      result = (Dali::Signal< void (Dali::RenderTask &) > *)new Dali::Signal< void (Dali::RenderTask &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24751,10 +19746,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetectedSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskSignal(void * jarg1) {
+  Dali::Signal< void (Dali::RenderTask &) > *arg1 = (Dali::Signal< void (Dali::RenderTask &) > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::RenderTask &) > *)jarg1;
   {
     try {
       delete arg1;
@@ -24764,15 +19759,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetectedSignal(void *
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Empty(void * jarg1) {
   bool jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   bool result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
   {
     try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > const *)arg1);
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24781,15 +19776,15 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Empty(void * ja
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   std::size_t result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > const *)arg1);
+      result = Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -24798,270 +19793,291 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_GetCon
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::TapGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::LongPressGesture const &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
-  void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor,Dali::TapGesture const &))jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::LongPressGesture const &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   Dali::Actor arg2 ;
-  Dali::TapGesture *arg3 = 0 ;
+  Dali::LongPressGesture *arg3 = 0 ;
   Dali::Actor *argp2 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
   argp2 = (Dali::Actor *)jarg2;
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
     return ;
   }
   arg2 = *argp2;
-  arg3 = (Dali::TapGesture *)jarg3;
+  arg3 = (Dali::LongPressGesture *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGesture const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::LongPressGesture const & type is null", 0);
     return ;
   }
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::TapGesture const &)*arg3);
+      Dali_Signal_Sl_void_Sp_Dali_LongPressGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::LongPressGesture const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetectedSignal() {
   void * jresult ;
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *result = 0 ;
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *result = 0 ;
 
   {
     try {
-      result = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) >();
+      result = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
-  return jresult;
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetectedSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetectedSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_KeyEventSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+  bool result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::KeyEvent const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_GetConnectionCount(void * jarg1) {
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_KeyEventSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
-  std::size_t result = 0;
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+  std::size_t result;
 
-  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
   {
     try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > const *)arg1);
-    }CALL_CATCH_EXCEPTION(0);
+      result = Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::KeyEvent const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
+
   jresult = (unsigned long)result;
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
-  void (*arg2)(Dali::Actor, Dali::LayoutDirection::Type) = (void (*)(Dali::Actor, Dali::LayoutDirection::Type)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor, Dali::LayoutDirection::Type))jarg2;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+  void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::KeyEvent const &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__Connect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
+
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
-  void (*arg2)(Dali::Actor, Dali::LayoutDirection::Type) = (void (*)(Dali::Actor, Dali::LayoutDirection::Type)) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
-  arg2 = (void (*)(Dali::Actor, Dali::LayoutDirection::Type))jarg2;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+  void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::KeyEvent const &))jarg2;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__Disconnect(arg1,arg2);
+      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
+
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_Emit(void * jarg1, void * jarg2, int jarg4) {
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
-  Dali::Actor arg2 ;
-  //bool arg3 ;
-  Dali::LayoutDirection::Type arg4 ;
-  Dali::Actor *argp2 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Emit(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+  Dali::KeyEvent *arg2 = 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
+  arg2 = (Dali::KeyEvent *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
     return ;
   }
-  arg2 = *argp2;
-  //arg3 = jarg3 ? true : false;
-  arg4 = (Dali::LayoutDirection::Type)jarg4;
   {
     try {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__Emit(arg1,arg2,arg4);
+      Dali_Signal_Sl_void_Sp_Dali_KeyEvent_SS_const_SA__SP__Sg__Emit(arg1,(Dali::KeyEvent const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
+
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ViewLayoutDirectionSignal() {
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyEventSignal() {
   void * jresult ;
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *result = 0 ;
+  Dali::Signal< void (Dali::KeyEvent const &) > *result = 0 ;
 
   {
     try {
-      result = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)new Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) >();
+      result = (Dali::Signal< void (Dali::KeyEvent const &) > *)new Dali::Signal< void (Dali::KeyEvent const &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
+
   jresult = (void *)result;
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewLayoutDirectionSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
 
-  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyEventSignal(void * jarg1) {
+  Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1;
   {
     try {
       delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
-}
 
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_director_connect(void *objarg, SwigDirector_ViewImpl::SWIG_Callback0_t callback0, SwigDirector_ViewImpl::SWIG_Callback1_t callback1, SwigDirector_ViewImpl::SWIG_Callback2_t callback2, SwigDirector_ViewImpl::SWIG_Callback3_t callback3, SwigDirector_ViewImpl::SWIG_Callback4_t callback4, SwigDirector_ViewImpl::SWIG_Callback5_t callback5, SwigDirector_ViewImpl::SWIG_Callback6_t callback6, SwigDirector_ViewImpl::SWIG_Callback9_t callback9, SwigDirector_ViewImpl::SWIG_Callback11_t callback11, SwigDirector_ViewImpl::SWIG_Callback12_t callback12, SwigDirector_ViewImpl::SWIG_Callback13_t callback13, SwigDirector_ViewImpl::SWIG_Callback14_t callback14, SwigDirector_ViewImpl::SWIG_Callback15_t callback15, SwigDirector_ViewImpl::SWIG_Callback16_t callback16, SwigDirector_ViewImpl::SWIG_Callback17_t callback17, SwigDirector_ViewImpl::SWIG_Callback18_t callback18, SwigDirector_ViewImpl::SWIG_Callback19_t callback19, SwigDirector_ViewImpl::SWIG_Callback20_t callback20, SwigDirector_ViewImpl::SWIG_Callback21_t callback21, SwigDirector_ViewImpl::SWIG_Callback24_t callback24, SwigDirector_ViewImpl::SWIG_Callback25_t callback25, SwigDirector_ViewImpl::SWIG_Callback26_t callback26, SwigDirector_ViewImpl::SWIG_Callback28_t callback28, SwigDirector_ViewImpl::SWIG_Callback29_t callback29, SwigDirector_ViewImpl::SWIG_Callback30_t callback30, SwigDirector_ViewImpl::SWIG_Callback31_t callback31, SwigDirector_ViewImpl::SWIG_Callback32_t callback32, SwigDirector_ViewImpl::SWIG_Callback33_t callback33, SwigDirector_ViewImpl::SWIG_Callback34_t callback34, SwigDirector_ViewImpl::SWIG_Callback35_t callback35, SwigDirector_ViewImpl::SWIG_Callback36_t callback36, SwigDirector_ViewImpl::SWIG_Callback37_t callback37, SwigDirector_ViewImpl::SWIG_Callback38_t callback38, SwigDirector_ViewImpl::SWIG_Callback39_t callback39, SwigDirector_ViewImpl::SWIG_Callback40_t callback40) {
-  Dali::Toolkit::Internal::Control *obj = (Dali::Toolkit::Internal::Control *)objarg;
-  SwigDirector_ViewImpl *director = dynamic_cast<SwigDirector_ViewImpl *>(obj);
-  if (director) {
-    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5, callback6, callback9, callback11, callback12, callback13, callback14, callback15, callback16, callback17, callback18, callback19, callback20, callback21, callback24, callback25, callback26, callback28, callback29, callback30, callback31, callback32, callback33, callback34, callback35, callback36, callback37, callback38, callback39, callback40);
-  }
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_StageWheelSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  bool result;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_director_connect(void *objarg, SwigDirector_ItemFactory::SWIG_Callback0_t callback0, SwigDirector_ItemFactory::SWIG_Callback1_t callback1, SwigDirector_ItemFactory::SWIG_Callback2_t callback2) {
-  Dali::Toolkit::ItemFactory *obj = (Dali::Toolkit::ItemFactory *)objarg;
-  SwigDirector_ItemFactory *director = dynamic_cast<SwigDirector_ItemFactory *>(obj);
-  if (director) {
-    director->swig_connect_director(callback0, callback1, callback2);
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  {
+    try {
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::WheelEvent const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
-}
-
-
-//// ========================= end of part 3 =============================
-
-//// ========================== start part 4 =============================
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_director_connect(void *objarg, SwigDirector_FrameCallbackInterface::SWIG_Callback0_t callback0) {
-  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)objarg;
-  SwigDirector_FrameCallbackInterface *director = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
-  if (director) {
-    director->swig_connect_director(callback0);
-  }
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameCallbackInterface() {
-  void * jresult ;
-  Dali::FrameCallbackInterface *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_StageWheelSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  std::size_t result;
 
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
   {
     try {
-      result =(Dali::FrameCallbackInterface *) new SwigDirector_FrameCallbackInterface();
+      result = Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::WheelEvent const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_AddFrameCallback(void * jarg1, void* jarg2, void* jarg3) {
-  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)jarg2;
-  SwigDirector_FrameCallbackInterface *arg2 = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
-
-  Dali::Stage *arg1 = (Dali::Stage *) 0;
-  Dali::Actor *arg3 = 0;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
 
-  arg1 = (Dali::Stage *)jarg1;
-  arg3 = (Dali::Actor *)jarg3;
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::WheelEvent const &))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  DevelStage::AddFrameCallback( *arg1, *arg2, *arg3 );
-  return;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_RemoveFrameCallback(void * jarg1, void* jarg2) {
-
-  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)jarg2;
-  SwigDirector_FrameCallbackInterface *arg2 = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
-
-  Dali::Stage *arg1 = (Dali::Stage *) 0;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
 
-  arg1 = (Dali::Stage *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::WheelEvent const &))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  DevelStage::RemoveFrameCallback( *arg1, *arg2 );
-  return;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomAlgorithmInterface_director_connect(void *objarg, SwigDirector_CustomAlgorithmInterface::SWIG_Callback0_t callback0) {
-  Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *obj = (Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *)objarg;
-  SwigDirector_CustomAlgorithmInterface *director = dynamic_cast<SwigDirector_CustomAlgorithmInterface *>(obj);
-  if (director) {
-    director->swig_connect_director(callback0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Emit(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+  Dali::WheelEvent *arg2 = 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  arg2 = (Dali::WheelEvent *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent const & type is null", 0);
+    return ;
+  }
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_WheelEvent_SS_const_SA__SP__Sg__Emit(arg1,(Dali::WheelEvent const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
+
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomAlgorithmInterface() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StageWheelSignal() {
   void * jresult ;
-  Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *result = 0 ;
+  Dali::Signal< void (Dali::WheelEvent const &) > *result = 0 ;
 
   {
     try {
-      result = (Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *)new SwigDirector_CustomAlgorithmInterface();
+      result = (Dali::Signal< void (Dali::WheelEvent const &) > *)new Dali::Signal< void (Dali::WheelEvent const &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25070,269 +20086,288 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomAlgorithmInterface() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_director_connect(void *objarg, SwigDirector_WidgetImpl::SWIG_Callback0_t callback0, SwigDirector_WidgetImpl::SWIG_Callback1_t callback1, SwigDirector_WidgetImpl::SWIG_Callback2_t callback2, SwigDirector_WidgetImpl::SWIG_Callback3_t callback3, SwigDirector_WidgetImpl::SWIG_Callback4_t callback4, SwigDirector_WidgetImpl::SWIG_Callback5_t callback5, SwigDirector_WidgetImpl::SWIG_Callback6_t callback6, SwigDirector_WidgetImpl::SWIG_Callback7_t callback7) {
-  SwigDirector_WidgetImpl *director = static_cast<SwigDirector_WidgetImpl *>(objarg);
-  if (director) {
-    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5, callback6, callback7);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StageWheelSignal(void * jarg1) {
+  Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
+
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WidgetImpl_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_0() {
   void * jresult ;
-  SwigDirector_WidgetImpl* result;
+  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
+
   {
     try {
-      result = new SwigDirector_WidgetImpl();
+      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >();
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = result;
+
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_GetImplementation__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Widget *arg1 = 0 ;
-  SwigDirector_WidgetImpl *result = 0 ;
+  Dali::Radian arg1 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp1 ;
+  Dali::Radian *argp2 ;
+  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
 
-  arg1 = (Dali::Widget *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Widget & type is null", 0);
+  argp1 = (Dali::Radian *)jarg1;
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return 0;
+  }
+  arg1 = *argp1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
     return 0;
   }
+  arg2 = *argp2;
   {
     try {
-      result = (SwigDirector_WidgetImpl *) &Dali::Internal::Adaptor::GetImplementation(*arg1);
+      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = (void*) result;
-  return jresult;
-}
 
-
-
-SWIGEXPORT Dali::SignalObserver * SWIGSTDCALL CSharp_Dali_ConnectionTrackerInterface_SWIGUpcast(Dali::ConnectionTrackerInterface *jarg1) {
-    return (Dali::SignalObserver *)jarg1;
+  jresult = (void *)result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::ConnectionTrackerInterface * SWIGSTDCALL CSharp_Dali_ConnectionTracker_SWIGUpcast(Dali::ConnectionTracker *jarg1) {
-    return (Dali::ConnectionTrackerInterface *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_ObjectRegistry_SWIGUpcast(Dali::ObjectRegistry *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_2(void * jarg1) {
+  void * jresult ;
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = 0 ;
+  std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PropertyCondition_SWIGUpcast(Dali::PropertyCondition *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< Dali::Radian,Dali::Radian > const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (std::pair< Dali::Radian,Dali::Radian > *)new std::pair< Dali::Radian,Dali::Radian >((std::pair< Dali::Radian,Dali::Radian > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PropertyNotification_SWIGUpcast(Dali::PropertyNotification *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
+  jresult = (void *)result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Handle_SWIGUpcast(Dali::Handle *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TypeInfo_SWIGUpcast(Dali::TypeInfo *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_set(void * jarg1, void * jarg2) {
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
+  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TypeRegistry_SWIGUpcast(Dali::TypeRegistry *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  arg2 = (Dali::Radian *)jarg2;
+  if (arg1) (arg1)->first = *arg2;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PixelData_SWIGUpcast(Dali::PixelData *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Texture_SWIGUpcast(Dali::Texture *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_get(void * jarg1) {
+  void * jresult ;
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
+  Dali::Radian *result = 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Sampler_SWIGUpcast(Dali::Sampler *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  result = (Dali::Radian *)& ((arg1)->first);
+  jresult = (void *)result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TextureSet_SWIGUpcast(Dali::TextureSet *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_VertexBuffer_SWIGUpcast(Dali::VertexBuffer *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_set(void * jarg1, void * jarg2) {
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
+  Dali::Radian *arg2 = (Dali::Radian *) 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Geometry_SWIGUpcast(Dali::Geometry *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  arg2 = (Dali::Radian *)jarg2;
+  if (arg1) (arg1)->second = *arg2;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Shader_SWIGUpcast(Dali::Shader *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Renderer_SWIGUpcast(Dali::Renderer *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_get(void * jarg1) {
+  void * jresult ;
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
+  Dali::Radian *result = 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_FrameBuffer_SWIGUpcast(Dali::FrameBuffer *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  result = (Dali::Radian *)& ((arg1)->second);
+  jresult = (void *)result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_RenderTaskList_SWIGUpcast(Dali::RenderTaskList *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_RenderTask_SWIGUpcast(Dali::RenderTask *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleThresholdPair(void * jarg1) {
+  std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Touch_SWIGUpcast(Dali::TouchEvent *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+  arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Hover_SWIGUpcast(Dali::HoverEvent *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Wheel_SWIGUpcast(Dali::WheelEvent *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Key_SWIGUpcast(Dali::KeyEvent *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  bool result;
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Gesture_SWIGUpcast(Dali::Gesture *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  {
+    try {
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_GestureDetector_SWIGUpcast(Dali::GestureDetector *jarg1) {
-    return (Dali::Handle *)jarg1;
+  jresult = result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SWIGUpcast(Dali::LongPressGestureDetector *jarg1) {
-    return (Dali::GestureDetector *)jarg1;
-}
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_LongPressGesture_SWIGUpcast(Dali::LongPressGesture *jarg1) {
-    return (Dali::Gesture *)jarg1;
-}
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  std::size_t result;
 
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  {
+    try {
+      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_CustomActorImpl_SWIGUpcast(Dali::CustomActorImpl *jarg1) {
-    return (Dali::RefObject *)jarg1;
+  jresult = (unsigned long)result;
+  return jresult;
 }
 
-SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_Dali_CustomActor_SWIGUpcast(Dali::CustomActor *jarg1) {
-    return (Dali::Actor *)jarg1;
-}
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_PanGestureDetector_SWIGUpcast(Dali::PanGestureDetector *jarg1) {
-    return (Dali::GestureDetector *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_PanGesture_SWIGUpcast(Dali::PanGesture *jarg1) {
-    return (Dali::Gesture *)jarg1;
-}
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::PanGesture const &))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_SWIGUpcast(Dali::PinchGestureDetector *jarg1) {
-    return (Dali::GestureDetector *)jarg1;
 }
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_PinchGesture_SWIGUpcast(Dali::PinchGesture *jarg1) {
-    return (Dali::Gesture *)jarg1;
-}
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_TapGestureDetector_SWIGUpcast(Dali::TapGestureDetector *jarg1) {
-    return (Dali::GestureDetector *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_TapGesture_SWIGUpcast(Dali::TapGesture *jarg1) {
-    return (Dali::Gesture *)jarg1;
-}
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::PanGesture const &))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_KeyFrames_SWIGUpcast(Dali::KeyFrames *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Path_SWIGUpcast(Dali::Path *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_LinearConstrainer_SWIGUpcast(Dali::LinearConstrainer *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::PanGesture *arg3 = 0 ;
+  Dali::Actor *argp2 ;
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_PathConstrainer_SWIGUpcast(Dali::PathConstrainer *jarg1) {
-    return (Dali::Handle *)jarg1;
-}
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  arg3 = (Dali::PanGesture *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PanGesture const & type is null", 0);
+    return ;
+  }
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PanGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::PanGesture const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_NativeImageInterface_SWIGUpcast(Dali::NativeImageInterface *jarg1) {
-    return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_Dali_CameraActor_SWIGUpcast(Dali::CameraActor *jarg1) {
-    return (Dali::Actor *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Timer_SWIGUpcast(Dali::Timer *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetectedSignal() {
+  void * jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *result = 0 ;
 
+  {
+    try {
+      result = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetEnvironmentVariable(char * jarg1) {
-  const char * result = EnvironmentVariable::GetEnvironmentVariable(jarg1);
-  char * jresult = SWIG_csharp_string_callback((const char *)result);
+  jresult = (void *)result;
   return jresult;
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_SetEnvironmentVariable(char * jarg1, char * jarg2) {
-  bool result = EnvironmentVariable::SetEnvironmentVariable(jarg1, jarg2);
-  return result;
-}
-
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Clear(void * jarg1) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetectedSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1;
   {
     try {
-      (arg1)->clear();
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Add(void * jarg1, unsigned int jarg2) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  unsigned int *arg2 = 0 ;
-  unsigned int temp2 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  bool result;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  temp2 = (unsigned int)jarg2;
-  arg2 = &temp2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
   {
     try {
-      (arg1)->push_back((unsigned int const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  std::vector< unsigned int >::size_type result;
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  std::size_t result;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
   {
     try {
-      result = ((std::vector< unsigned int > const *)arg1)->size();
+      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25341,66 +20376,70 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_size(void * jar
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_capacity(void * jarg1) {
-  unsigned long jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  std::vector< unsigned int >::size_type result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::PinchGesture const &))jarg2;
   {
     try {
-      result = ((std::vector< unsigned int > const *)arg1)->capacity();
-    } CALL_CATCH_EXCEPTION(0);
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_reserve(void * jarg1, unsigned long jarg2) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  std::vector< unsigned int >::size_type arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (std::vector< unsigned int >::size_type)jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::PinchGesture const &))jarg2;
   {
     try {
-      (arg1)->reserve(arg2);
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_0() {
-  void * jresult ;
-  std::vector< unsigned int > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::PinchGesture *arg3 = 0 ;
+  Dali::Actor *argp2 ;
 
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  arg3 = (Dali::PinchGesture *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::PinchGesture const & type is null", 0);
+    return ;
+  }
   {
     try {
-      result = (std::vector< unsigned int > *)new std::vector< unsigned int >();
-    } CALL_CATCH_EXCEPTION(0);
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_PinchGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::PinchGesture const &)*arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetectedSignal() {
   void * jresult ;
-  std::vector< unsigned int > *arg1 = 0 ;
-  std::vector< unsigned int > *result = 0 ;
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *result = 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (std::vector< unsigned int > *)new std::vector< unsigned int >((std::vector< unsigned int > const &)*arg1);
+      result = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25409,48 +20448,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_2(int jarg1) {
-  void * jresult ;
-  int arg1 ;
-  std::vector< unsigned int > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetectedSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
 
-  arg1 = (int)jarg1;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1;
   {
     try {
-      try {
-        result = (std::vector< unsigned int > *)new_std_vector_Sl_unsigned_SS_int_Sg___SWIG_2(arg1);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitemcopy(void * jarg1, int jarg2) {
-  unsigned int jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  unsigned int result;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Empty(void * jarg1) {
+  bool jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  bool result;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
   {
     try {
-      try {
-        result = (unsigned int)std_vector_Sl_unsigned_SS_int_Sg__getitemcopy(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25459,101 +20478,87 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitemcopy(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitem(void * jarg1, int jarg2) {
-  unsigned int jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  unsigned int *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  std::size_t result;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
   {
     try {
-      try {
-        result = (unsigned int *) &std_vector_Sl_unsigned_SS_int_Sg__getitem(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > const *)arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = *result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_setitem(void * jarg1, int jarg2, unsigned int jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  unsigned int *arg3 = 0 ;
-  unsigned int temp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  temp3 = (unsigned int)jarg3;
-  arg3 = &temp3;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::TapGesture const &))jarg2;
   {
     try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__setitem(arg1,arg2,(unsigned int const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
 
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor,Dali::TapGesture const &))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_AddRange(void * jarg1, void * jarg2) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  std::vector< unsigned int > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
+  Dali::Actor arg2 ;
+  Dali::TapGesture *arg3 = 0 ;
+  Dali::Actor *argp2 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (std::vector< unsigned int > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  arg3 = (Dali::TapGesture *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TapGesture const & type is null", 0);
     return ;
   }
   {
     try {
-      std_vector_Sl_unsigned_SS_int_Sg__AddRange(arg1,(std::vector< unsigned int > const &)*arg2);
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_TapGesture_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::TapGesture const &)*arg3);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetectedSignal() {
   void * jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  std::vector< unsigned int > *result = 0 ;
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *result = 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
   {
     try {
-      try {
-        result = (std::vector< unsigned int > *)std_vector_Sl_unsigned_SS_int_Sg__GetRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return 0;
-      }
-
+      result = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)new Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25562,130 +20567,97 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_GetRange(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Insert(void * jarg1, int jarg2, unsigned int jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  unsigned int *arg3 = 0 ;
-  unsigned int temp3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetectedSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  temp3 = (unsigned int)jarg3;
-  arg3 = &temp3;
+  arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1;
   {
     try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__Insert(arg1,arg2,(unsigned int const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  std::vector< unsigned int > *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
+  void (*arg2)(Dali::Actor, Dali::LayoutDirection::Type) = (void (*)(Dali::Actor, Dali::LayoutDirection::Type)) 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< unsigned int > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
-    return ;
-  }
+  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor, Dali::LayoutDirection::Type))jarg2;
   {
     try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__InsertRange(arg1,arg2,(std::vector< unsigned int > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__Connect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
-
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewLayoutDirectionSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
+  void (*arg2)(Dali::Actor, Dali::LayoutDirection::Type) = (void (*)(Dali::Actor, Dali::LayoutDirection::Type)) 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveAt(void * jarg1, int jarg2) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
+  arg2 = (void (*)(Dali::Actor, Dali::LayoutDirection::Type))jarg2;
   {
     try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__RemoveAt(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
+      Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_LayoutDirection_Type_SP__Sg__Disconnect(arg1,arg2);
     } CALL_CATCH_EXCEPTION();
   }
-
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  int arg3 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewLayoutDirectionSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Actor, Dali::LayoutDirection::Type) > *)jarg1;
   {
     try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__RemoveRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_director_connect(void *objarg, SwigDirector_ViewImpl::SWIG_Callback0_t callback0, SwigDirector_ViewImpl::SWIG_Callback1_t callback1, SwigDirector_ViewImpl::SWIG_Callback2_t callback2, SwigDirector_ViewImpl::SWIG_Callback3_t callback3, SwigDirector_ViewImpl::SWIG_Callback4_t callback4, SwigDirector_ViewImpl::SWIG_Callback5_t callback5, SwigDirector_ViewImpl::SWIG_Callback6_t callback6, SwigDirector_ViewImpl::SWIG_Callback9_t callback9, SwigDirector_ViewImpl::SWIG_Callback11_t callback11, SwigDirector_ViewImpl::SWIG_Callback12_t callback12, SwigDirector_ViewImpl::SWIG_Callback13_t callback13, SwigDirector_ViewImpl::SWIG_Callback14_t callback14, SwigDirector_ViewImpl::SWIG_Callback15_t callback15, SwigDirector_ViewImpl::SWIG_Callback16_t callback16, SwigDirector_ViewImpl::SWIG_Callback17_t callback17, SwigDirector_ViewImpl::SWIG_Callback18_t callback18, SwigDirector_ViewImpl::SWIG_Callback19_t callback19, SwigDirector_ViewImpl::SWIG_Callback20_t callback20, SwigDirector_ViewImpl::SWIG_Callback21_t callback21, SwigDirector_ViewImpl::SWIG_Callback24_t callback24, SwigDirector_ViewImpl::SWIG_Callback25_t callback25, SwigDirector_ViewImpl::SWIG_Callback26_t callback26, SwigDirector_ViewImpl::SWIG_Callback28_t callback28, SwigDirector_ViewImpl::SWIG_Callback29_t callback29, SwigDirector_ViewImpl::SWIG_Callback30_t callback30, SwigDirector_ViewImpl::SWIG_Callback31_t callback31, SwigDirector_ViewImpl::SWIG_Callback32_t callback32, SwigDirector_ViewImpl::SWIG_Callback33_t callback33, SwigDirector_ViewImpl::SWIG_Callback34_t callback34, SwigDirector_ViewImpl::SWIG_Callback35_t callback35, SwigDirector_ViewImpl::SWIG_Callback36_t callback36, SwigDirector_ViewImpl::SWIG_Callback37_t callback37, SwigDirector_ViewImpl::SWIG_Callback38_t callback38, SwigDirector_ViewImpl::SWIG_Callback39_t callback39, SwigDirector_ViewImpl::SWIG_Callback40_t callback40) {
+  Dali::Toolkit::Internal::Control *obj = (Dali::Toolkit::Internal::Control *)objarg;
+  SwigDirector_ViewImpl *director = dynamic_cast<SwigDirector_ViewImpl *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5, callback6, callback9, callback11, callback12, callback13, callback14, callback15, callback16, callback17, callback18, callback19, callback20, callback21, callback24, callback25, callback26, callback28, callback29, callback30, callback31, callback32, callback33, callback34, callback35, callback36, callback37, callback38, callback39, callback40);
+  }
+}
 
-    } CALL_CATCH_EXCEPTION();
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_director_connect(void *objarg, SwigDirector_ItemFactory::SWIG_Callback0_t callback0, SwigDirector_ItemFactory::SWIG_Callback1_t callback1, SwigDirector_ItemFactory::SWIG_Callback2_t callback2) {
+  Dali::Toolkit::ItemFactory *obj = (Dali::Toolkit::ItemFactory *)objarg;
+  SwigDirector_ItemFactory *director = dynamic_cast<SwigDirector_ItemFactory *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2);
   }
+}
+
+
+//// ========================= end of part 3 =============================
+
+//// ========================== start part 4 =============================
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_director_connect(void *objarg, SwigDirector_FrameCallbackInterface::SWIG_Callback0_t callback0) {
+  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)objarg;
+  SwigDirector_FrameCallbackInterface *director = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0);
+  }
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_Repeat(unsigned int jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameCallbackInterface() {
   void * jresult ;
-  unsigned int *arg1 = 0 ;
-  int arg2 ;
-  unsigned int temp1 ;
-  std::vector< unsigned int > *result = 0 ;
+  Dali::FrameCallbackInterface *result = 0 ;
 
-  temp1 = (unsigned int)jarg1;
-  arg1 = &temp1;
-  arg2 = (int)jarg2;
   {
     try {
-      try {
-        result = (std::vector< unsigned int > *)std_vector_Sl_unsigned_SS_int_Sg__Repeat((unsigned int const &)*arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result =(Dali::FrameCallbackInterface *) new SwigDirector_FrameCallbackInterface();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -25694,378 +20666,357 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_Repeat(unsigned int ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_0(void * jarg1) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_AddFrameCallback(void * jarg1, void* jarg2, void* jarg3) {
+  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)jarg2;
+  SwigDirector_FrameCallbackInterface *arg2 = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  {
-    try {
-      std_vector_Sl_unsigned_SS_int_Sg__Reverse__SWIG_0(arg1);
-    } CALL_CATCH_EXCEPTION();
-  }
+  Dali::Stage *arg1 = (Dali::Stage *) 0;
+  Dali::Actor *arg3 = 0;
 
-}
+  arg1 = (Dali::Stage *)jarg1;
+  arg3 = (Dali::Actor *)jarg3;
 
+  DevelStage::AddFrameCallback( *arg1, *arg2, *arg3 );
+  return;
+}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  int arg3 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  {
-    try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_RemoveFrameCallback(void * jarg1, void* jarg2) {
 
-    } CALL_CATCH_EXCEPTION();
-  }
+  Dali::FrameCallbackInterface *obj = (Dali::FrameCallbackInterface *)jarg2;
+  SwigDirector_FrameCallbackInterface *arg2 = dynamic_cast<SwigDirector_FrameCallbackInterface *>(obj);
 
-}
+  Dali::Stage *arg1 = (Dali::Stage *) 0;
 
+  arg1 = (Dali::Stage *)jarg1;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  int arg2 ;
-  std::vector< unsigned int > *arg3 = 0 ;
+  DevelStage::RemoveFrameCallback( *arg1, *arg2 );
+  return;
+}
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< unsigned int > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      try {
-        std_vector_Sl_unsigned_SS_int_Sg__SetRange(arg1,arg2,(std::vector< unsigned int > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
 
-    } CALL_CATCH_EXCEPTION();
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomAlgorithmInterface_director_connect(void *objarg, SwigDirector_CustomAlgorithmInterface::SWIG_Callback0_t callback0) {
+  Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *obj = (Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *)objarg;
+  SwigDirector_CustomAlgorithmInterface *director = dynamic_cast<SwigDirector_CustomAlgorithmInterface *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0);
   }
-
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ItemIdContainer_Contains(void * jarg1, unsigned int jarg2) {
-  bool jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  unsigned int *arg2 = 0 ;
-  unsigned int temp2 ;
-  bool result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomAlgorithmInterface() {
+  void * jresult ;
+  Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *result = 0 ;
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  temp2 = (unsigned int)jarg2;
-  arg2 = &temp2;
   {
     try {
-      result = (bool)std_vector_Sl_unsigned_SS_int_Sg__Contains(arg1,(unsigned int const &)*arg2);
+      result = (Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *)new SwigDirector_CustomAlgorithmInterface();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = result;
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_IndexOf(void * jarg1, unsigned int jarg2) {
-  int jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  unsigned int *arg2 = 0 ;
-  unsigned int temp2 ;
-  int result;
-
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  temp2 = (unsigned int)jarg2;
-  arg2 = &temp2;
-  {
-    try {
-      result = (int)std_vector_Sl_unsigned_SS_int_Sg__IndexOf(arg1,(unsigned int const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_director_connect(void *objarg, SwigDirector_WidgetImpl::SWIG_Callback0_t callback0, SwigDirector_WidgetImpl::SWIG_Callback1_t callback1, SwigDirector_WidgetImpl::SWIG_Callback2_t callback2, SwigDirector_WidgetImpl::SWIG_Callback3_t callback3, SwigDirector_WidgetImpl::SWIG_Callback4_t callback4, SwigDirector_WidgetImpl::SWIG_Callback5_t callback5, SwigDirector_WidgetImpl::SWIG_Callback6_t callback6, SwigDirector_WidgetImpl::SWIG_Callback7_t callback7) {
+  SwigDirector_WidgetImpl *director = static_cast<SwigDirector_WidgetImpl *>(objarg);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5, callback6, callback7);
   }
-
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_LastIndexOf(void * jarg1, unsigned int jarg2) {
-  int jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  unsigned int *arg2 = 0 ;
-  unsigned int temp2 ;
-  int result;
-
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  temp2 = (unsigned int)jarg2;
-  arg2 = &temp2;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WidgetImpl_New() {
+  void * jresult ;
+  SwigDirector_WidgetImpl* result;
   {
     try {
-      result = (int)std_vector_Sl_unsigned_SS_int_Sg__LastIndexOf(arg1,(unsigned int const &)*arg2);
+      result = new SwigDirector_WidgetImpl();
     } CALL_CATCH_EXCEPTION(0);
   }
-
   jresult = result;
   return jresult;
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ItemIdContainer_Remove(void * jarg1, unsigned int jarg2) {
-  bool jresult ;
-  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
-  unsigned int *arg2 = 0 ;
-  unsigned int temp2 ;
-  bool result;
+SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_PanGesture_SWIGUpcast(Dali::PanGesture *jarg1) {
+    return (Dali::Gesture *)jarg1;
+}
 
-  arg1 = (std::vector< unsigned int > *)jarg1;
-  temp2 = (unsigned int)jarg2;
-  arg2 = &temp2;
-  {
-    try {
-      result = (bool)std_vector_Sl_unsigned_SS_int_Sg__Remove(arg1,(unsigned int const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetEnvironmentVariable(char * jarg1) {
+  const char * result = EnvironmentVariable::GetEnvironmentVariable(jarg1);
+  char * jresult = SWIG_csharp_string_callback((const char *)result);
   return jresult;
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_SetEnvironmentVariable(char * jarg1, char * jarg2) {
+  bool result = EnvironmentVariable::SetEnvironmentVariable(jarg1, jarg2);
+  return result;
+}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemIdContainer(void * jarg1) {
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Clear(void * jarg1) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
 
   arg1 = (std::vector< unsigned int > *)jarg1;
   {
     try {
-      delete arg1;
+      (arg1)->clear();
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_0() {
-  void * jresult ;
-  std::pair< unsigned int,Dali::Actor > *result = 0 ;
-
-  {
-    try {
-      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_1(unsigned int jarg1, void * jarg2) {
-  void * jresult ;
-  unsigned int arg1 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-  std::pair< unsigned int,Dali::Actor > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Add(void * jarg1, unsigned int jarg2) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  unsigned int *arg2 = 0 ;
+  unsigned int temp2 ;
 
-  arg1 = (unsigned int)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg2 = *argp2;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  temp2 = (unsigned int)jarg2;
+  arg2 = &temp2;
   {
     try {
-      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >(arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->push_back((unsigned int const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_2(void * jarg1) {
-  void * jresult ;
-  std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
-  std::pair< unsigned int,Dali::Actor > *result = 0 ;
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_size(void * jarg1) {
+  unsigned long jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  std::vector< unsigned int >::size_type result;
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (std::vector< unsigned int > *)jarg1;
   {
     try {
-      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >((std::pair< unsigned int,Dali::Actor > const &)*arg1);
+      result = ((std::vector< unsigned int > const *)arg1)->size();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_first_set(void * jarg1, unsigned int jarg2) {
-  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
-  unsigned int arg2 ;
-
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  if (arg1) (arg1)->first = arg2;
-}
-
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_capacity(void * jarg1) {
+  unsigned long jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  std::vector< unsigned int >::size_type result;
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Item_first_get(void * jarg1) {
-  unsigned int jresult ;
-  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
-  unsigned int result;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  {
+    try {
+      result = ((std::vector< unsigned int > const *)arg1)->capacity();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  result = (unsigned int) ((arg1)->first);
-  jresult = result;
+  jresult = (unsigned long)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_second_set(void * jarg1, void * jarg2) {
-  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
-  Dali::Actor *arg2 = (Dali::Actor *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_reserve(void * jarg1, unsigned long jarg2) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  std::vector< unsigned int >::size_type arg2 ;
+
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (std::vector< unsigned int >::size_type)jarg2;
+  {
+    try {
+      (arg1)->reserve(arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
-  if (arg1) (arg1)->second = *arg2;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Item_second_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_0() {
   void * jresult ;
-  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
-  Dali::Actor *result = 0 ;
+  std::vector< unsigned int > *result = 0 ;
+
+  {
+    try {
+      result = (std::vector< unsigned int > *)new std::vector< unsigned int >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  result = (Dali::Actor *)& ((arg1)->second);
   jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Item(void * jarg1) {
-  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_1(void * jarg1) {
+  void * jresult ;
+  std::vector< unsigned int > *arg1 = 0 ;
+  std::vector< unsigned int > *result = 0 ;
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
+      result = (std::vector< unsigned int > *)new std::vector< unsigned int >((std::vector< unsigned int > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Clear(void * jarg1) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_2(int jarg1) {
+  void * jresult ;
+  int arg1 ;
+  std::vector< unsigned int > *result = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (int)jarg1;
   {
     try {
-      (arg1)->clear();
-    } CALL_CATCH_EXCEPTION();
+      try {
+        result = (std::vector< unsigned int > *)new_std_vector_Sl_unsigned_SS_int_Sg___SWIG_2(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Add(void * jarg1, void * jarg2) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  std::pair< unsigned int,Dali::Actor > *arg2 = 0 ;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitemcopy(void * jarg1, int jarg2) {
+  unsigned int jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  unsigned int result;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (std::pair< unsigned int,Dali::Actor > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
-    return ;
-  }
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      (arg1)->push_back((std::pair< unsigned int,Dali::Actor > const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
+      try {
+        result = (unsigned int)std_vector_Sl_unsigned_SS_int_Sg__getitemcopy(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_size(void * jarg1) {
-  unsigned long jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitem(void * jarg1, int jarg2) {
+  unsigned int jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  unsigned int *result = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
   {
     try {
-      result = ((std::vector< std::pair< unsigned int,Dali::Actor > > const *)arg1)->size();
+      try {
+        result = (unsigned int *) &std_vector_Sl_unsigned_SS_int_Sg__getitem(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (unsigned long)result;
+  jresult = *result;
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_capacity(void * jarg1) {
-  unsigned long jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_setitem(void * jarg1, int jarg2, unsigned int jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  unsigned int *arg3 = 0 ;
+  unsigned int temp3 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
+  temp3 = (unsigned int)jarg3;
+  arg3 = &temp3;
   {
     try {
-      result = ((std::vector< std::pair< unsigned int,Dali::Actor > > const *)arg1)->capacity();
-    } CALL_CATCH_EXCEPTION(0);
+      try {
+        std_vector_Sl_unsigned_SS_int_Sg__setitem(arg1,arg2,(unsigned int const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (unsigned long)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_reserve(void * jarg1, unsigned long jarg2) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_AddRange(void * jarg1, void * jarg2) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  std::vector< unsigned int > *arg2 = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (std::vector< std::pair< unsigned int,Dali::Actor > >::size_type)jarg2;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (std::vector< unsigned int > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
+    return ;
+  }
   {
     try {
-      (arg1)->reserve(arg2);
+      std_vector_Sl_unsigned_SS_int_Sg__AddRange(arg1,(std::vector< unsigned int > const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  std::vector< unsigned int > *result = 0 ;
 
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
-      result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new std::vector< std::pair< unsigned int,Dali::Actor > >();
+      try {
+        result = (std::vector< unsigned int > *)std_vector_Sl_unsigned_SS_int_Sg__GetRange(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return 0;
+      }
+
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26074,198 +21025,195 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_1(void * jarg1) {
-  void * jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = 0 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Insert(void * jarg1, int jarg2, unsigned int jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  unsigned int *arg3 = 0 ;
+  unsigned int temp3 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
-    return 0;
-  }
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
+  temp3 = (unsigned int)jarg3;
+  arg3 = &temp3;
   {
     try {
-      result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new std::vector< std::pair< unsigned int,Dali::Actor > >((std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      try {
+        std_vector_Sl_unsigned_SS_int_Sg__Insert(arg1,arg2,(unsigned int const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_2(int jarg1) {
-  void * jresult ;
-  int arg1 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  int arg2 ;
+  std::vector< unsigned int > *arg3 = 0 ;
 
-  arg1 = (int)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  arg2 = (int)jarg2;
+  arg3 = (std::vector< unsigned int > *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
+    return ;
+  }
   {
     try {
       try {
-        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new_std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg___SWIG_2(arg1);
+        std_vector_Sl_unsigned_SS_int_Sg__InsertRange(arg1,arg2,(std::vector< unsigned int > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
+        return ;
       }
 
-    } CALL_CATCH_EXCEPTION(0);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitemcopy(void * jarg1, int jarg2) {
-  void * jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveAt(void * jarg1, int jarg2) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
-  std::pair< unsigned int,Dali::Actor > result;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
   arg2 = (int)jarg2;
   {
     try {
       try {
-        result = std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__getitemcopy(arg1,arg2);
+        std_vector_Sl_unsigned_SS_int_Sg__RemoveAt(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
+        return ;
       }
 
-    } CALL_CATCH_EXCEPTION(0);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new std::pair< unsigned int,Dali::Actor >((const std::pair< unsigned int,Dali::Actor > &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitem(void * jarg1, int jarg2) {
-  void * jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
-  std::pair< unsigned int,Dali::Actor > *result = 0 ;
+  int arg3 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
   arg2 = (int)jarg2;
+  arg3 = (int)jarg3;
   {
     try {
       try {
-        result = (std::pair< unsigned int,Dali::Actor > *) &std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__getitem(arg1,arg2);
+        std_vector_Sl_unsigned_SS_int_Sg__RemoveRange(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
+        return ;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return ;
       }
 
-    } CALL_CATCH_EXCEPTION(0);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_Repeat(unsigned int jarg1, int jarg2) {
+  void * jresult ;
+  unsigned int *arg1 = 0 ;
   int arg2 ;
-  std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
+  unsigned int temp1 ;
+  std::vector< unsigned int > *result = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  temp1 = (unsigned int)jarg1;
+  arg1 = &temp1;
   arg2 = (int)jarg2;
-  arg3 = (std::pair< unsigned int,Dali::Actor > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
-    return ;
-  }
   {
     try {
       try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__setitem(arg1,arg2,(std::pair< unsigned int,Dali::Actor > const &)*arg3);
+        result = (std::vector< unsigned int > *)std_vector_Sl_unsigned_SS_int_Sg__Repeat((unsigned int const &)*arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
+        return 0;
       }
 
-    } CALL_CATCH_EXCEPTION();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_AddRange(void * jarg1, void * jarg2) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_0(void * jarg1) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
-    return ;
-  }
+  arg1 = (std::vector< unsigned int > *)jarg1;
   {
     try {
-      std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__AddRange(arg1,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg2);
+      std_vector_Sl_unsigned_SS_int_Sg__Reverse__SWIG_0(arg1);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   int arg3 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
   arg2 = (int)jarg2;
   arg3 = (int)jarg3;
   {
     try {
       try {
-        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__GetRange(arg1,arg2,arg3);
+        std_vector_Sl_unsigned_SS_int_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
+        return ;
       }
       catch(std::invalid_argument &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return 0;
+        return ;
       }
 
-    } CALL_CATCH_EXCEPTION(0);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
-  std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
+  std::vector< unsigned int > *arg3 = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::vector< unsigned int > *)jarg1;
   arg2 = (int)jarg2;
-  arg3 = (std::pair< unsigned int,Dali::Actor > *)jarg3;
+  arg3 = (std::vector< unsigned int > *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< unsigned int > const & type is null", 0);
     return ;
   }
   {
     try {
       try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Insert(arg1,arg2,(std::pair< unsigned int,Dali::Actor > const &)*arg3);
+        std_vector_Sl_unsigned_SS_int_Sg__SetRange(arg1,arg2,(std::vector< unsigned int > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26278,106 +21226,135 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Insert(void * jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  int arg2 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ItemIdContainer_Contains(void * jarg1, unsigned int jarg2) {
+  bool jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  unsigned int *arg2 = 0 ;
+  unsigned int temp2 ;
+  bool result;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
-    return ;
-  }
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  temp2 = (unsigned int)jarg2;
+  arg2 = &temp2;
   {
     try {
-      try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__InsertRange(arg1,arg2,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-
-    } CALL_CATCH_EXCEPTION();
+      result = (bool)std_vector_Sl_unsigned_SS_int_Sg__Contains(arg1,(unsigned int const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveAt(void * jarg1, int jarg2) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  int arg2 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_IndexOf(void * jarg1, unsigned int jarg2) {
+  int jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  unsigned int *arg2 = 0 ;
+  unsigned int temp2 ;
+  int result;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (int)jarg2;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  temp2 = (unsigned int)jarg2;
+  arg2 = &temp2;
   {
     try {
-      try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__RemoveAt(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
+      result = (int)std_vector_Sl_unsigned_SS_int_Sg__IndexOf(arg1,(unsigned int const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
 
-    } CALL_CATCH_EXCEPTION();
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_LastIndexOf(void * jarg1, unsigned int jarg2) {
+  int jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  unsigned int *arg2 = 0 ;
+  unsigned int temp2 ;
+  int result;
+
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  temp2 = (unsigned int)jarg2;
+  arg2 = &temp2;
+  {
+    try {
+      result = (int)std_vector_Sl_unsigned_SS_int_Sg__LastIndexOf(arg1,(unsigned int const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  int arg2 ;
-  int arg3 ;
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ItemIdContainer_Remove(void * jarg1, unsigned int jarg2) {
+  bool jresult ;
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
+  unsigned int *arg2 = 0 ;
+  unsigned int temp2 ;
+  bool result;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  temp2 = (unsigned int)jarg2;
+  arg2 = &temp2;
   {
     try {
-      try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__RemoveRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
+      result = (bool)std_vector_Sl_unsigned_SS_int_Sg__Remove(arg1,(unsigned int const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemIdContainer(void * jarg1) {
+  std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
 
+  arg1 = (std::vector< unsigned int > *)jarg1;
+  {
+    try {
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_0() {
+  void * jresult ;
+  std::pair< unsigned int,Dali::Actor > *result = 0 ;
+
+  {
+    try {
+      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_1(unsigned int jarg1, void * jarg2) {
   void * jresult ;
-  std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
-  int arg2 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
+  unsigned int arg1 ;
+  Dali::Actor arg2 ;
+  Dali::Actor *argp2 ;
+  std::pair< unsigned int,Dali::Actor > *result = 0 ;
 
-  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
+  arg1 = (unsigned int)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
     return 0;
   }
-  arg2 = (int)jarg2;
+  arg2 = *argp2;
   {
     try {
-      try {
-        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Repeat((std::pair< unsigned int,Dali::Actor > const &)*arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-
+      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >(arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26386,79 +21363,75 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_Repeat(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_0(void * jarg1) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_2(void * jarg1) {
+  void * jresult ;
+  std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
+  std::pair< unsigned int,Dali::Actor > *result = 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Reverse__SWIG_0(arg1);
-    } CALL_CATCH_EXCEPTION();
+      result = (std::pair< unsigned int,Dali::Actor > *)new std::pair< unsigned int,Dali::Actor >((std::pair< unsigned int,Dali::Actor > const &)*arg1);
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  int arg2 ;
-  int arg3 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_first_set(void * jarg1, unsigned int jarg2) {
+  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
+  unsigned int arg2 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  {
-    try {
-      try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Reverse__SWIG_1(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  arg2 = (unsigned int)jarg2;
+  if (arg1) (arg1)->first = arg2;
+}
 
-    } CALL_CATCH_EXCEPTION();
-  }
 
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Item_first_get(void * jarg1) {
+  unsigned int jresult ;
+  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
+  unsigned int result;
+
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  result = (unsigned int) ((arg1)->first);
+  jresult = result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
-  int arg2 ;
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_second_set(void * jarg1, void * jarg2) {
+  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
+  Dali::Actor *arg2 = (Dali::Actor *) 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      try {
-        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__SetRange(arg1,arg2,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  arg2 = (Dali::Actor *)jarg2;
+  if (arg1) (arg1)->second = *arg2;
+}
 
-    } CALL_CATCH_EXCEPTION();
-  }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Item_second_get(void * jarg1) {
+  void * jresult ;
+  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
+  Dali::Actor *result = 0 ;
+
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
+  result = (Dali::Actor *)& ((arg1)->second);
+  jresult = (void *)result;
+  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemContainer(void * jarg1) {
-  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Item(void * jarg1) {
+  std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
 
-  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
   {
     try {
       delete arg1;
@@ -26468,10 +21441,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Clear(void * jarg1) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Clear(void * jarg1) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   {
     try {
       (arg1)->clear();
@@ -26481,34 +21454,34 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Add(void * jarg1, void * jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  Dali::Actor *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Add(void * jarg1, void * jarg2) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+  std::pair< unsigned int,Dali::Actor > *arg2 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
-  arg2 = (Dali::Actor *)jarg2;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg2 = (std::pair< unsigned int,Dali::Actor > *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
     return ;
   }
   {
     try {
-      (arg1)->push_back((Dali::Actor const &)*arg2);
+      (arg1)->push_back((std::pair< unsigned int,Dali::Actor > const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_size(void * jarg1) {
   unsigned long jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  std::vector< Dali::Actor >::size_type result;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   {
     try {
-      result = ((std::vector< Dali::Actor > const *)arg1)->size();
+      result = ((std::vector< std::pair< unsigned int,Dali::Actor > > const *)arg1)->size();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26517,15 +21490,15 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_size(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_capacity(void * jarg1) {
   unsigned long jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  std::vector< Dali::Actor >::size_type result;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   {
     try {
-      result = ((std::vector< Dali::Actor > const *)arg1)->capacity();
+      result = ((std::vector< std::pair< unsigned int,Dali::Actor > > const *)arg1)->capacity();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26534,12 +21507,12 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_capacity(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_reserve(void * jarg1, unsigned long jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  std::vector< Dali::Actor >::size_type arg2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_reserve(void * jarg1, unsigned long jarg2) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > >::size_type arg2 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
-  arg2 = (std::vector< Dali::Actor >::size_type)jarg2;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg2 = (std::vector< std::pair< unsigned int,Dali::Actor > >::size_type)jarg2;
   {
     try {
       (arg1)->reserve(arg2);
@@ -26549,13 +21522,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_reserve(void * jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_0() {
   void * jresult ;
-  std::vector< Dali::Actor > *result = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
   {
     try {
-      result = (std::vector< Dali::Actor > *)new std::vector< Dali::Actor >();
+      result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new std::vector< std::pair< unsigned int,Dali::Actor > >();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26564,19 +21537,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_1(void * jarg1) {
   void * jresult ;
-  std::vector< Dali::Actor > *arg1 = 0 ;
-  std::vector< Dali::Actor > *result = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (std::vector< Dali::Actor > *)new std::vector< Dali::Actor >((std::vector< Dali::Actor > const &)*arg1);
+      result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new std::vector< std::pair< unsigned int,Dali::Actor > >((std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -26585,16 +21558,16 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
-  std::vector< Dali::Actor > *result = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
   arg1 = (int)jarg1;
   {
     try {
       try {
-        result = (std::vector< Dali::Actor > *)new_std_vector_Sl_Dali_Actor_Sg___SWIG_2(arg1);
+        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)new_std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg___SWIG_2(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26609,18 +21582,18 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_2(int jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitemcopy(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitemcopy(void * jarg1, int jarg2) {
   void * jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  Dali::Actor result;
+  std::pair< unsigned int,Dali::Actor > result;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   {
     try {
       try {
-        result = std_vector_Sl_Dali_Actor_Sg__getitemcopy(arg1,arg2);
+        result = std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__getitemcopy(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26630,23 +21603,23 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitemcopy(void * jarg
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Actor((const Dali::Actor &)result);
+  jresult = new std::pair< unsigned int,Dali::Actor >((const std::pair< unsigned int,Dali::Actor > &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitem(void * jarg1, int jarg2) {
   void * jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  Dali::Actor *result = 0 ;
+  std::pair< unsigned int,Dali::Actor > *result = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   {
     try {
       try {
-        result = (Dali::Actor *) &std_vector_Sl_Dali_Actor_Sg__getitem(arg1,arg2);
+        result = (std::pair< unsigned int,Dali::Actor > *) &std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__getitem(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26661,22 +21634,22 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitem(void * jarg1, i
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  Dali::Actor *arg3 = 0 ;
+  std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
-  arg3 = (Dali::Actor *)jarg3;
+  arg3 = (std::pair< unsigned int,Dali::Actor > *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
     return ;
   }
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__setitem(arg1,arg2,(Dali::Actor const &)*arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__setitem(arg1,arg2,(std::pair< unsigned int,Dali::Actor > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26689,39 +21662,39 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_setitem(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_AddRange(void * jarg1, void * jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  std::vector< Dali::Actor > *arg2 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_AddRange(void * jarg1, void * jarg2) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg2 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
-  arg2 = (std::vector< Dali::Actor > *)jarg2;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
+  arg2 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
     return ;
   }
   {
     try {
-      std_vector_Sl_Dali_Actor_Sg__AddRange(arg1,(std::vector< Dali::Actor > const &)*arg2);
+      std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__AddRange(arg1,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   int arg3 ;
-  std::vector< Dali::Actor > *result = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   arg3 = (int)jarg3;
   {
     try {
       try {
-        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__GetRange(arg1,arg2,arg3);
+        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__GetRange(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26740,22 +21713,22 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_GetRange(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  Dali::Actor *arg3 = 0 ;
+  std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
-  arg3 = (Dali::Actor *)jarg3;
+  arg3 = (std::pair< unsigned int,Dali::Actor > *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
     return ;
   }
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__Insert(arg1,arg2,(Dali::Actor const &)*arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Insert(arg1,arg2,(std::pair< unsigned int,Dali::Actor > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26768,22 +21741,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Insert(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  std::vector< Dali::Actor > *arg3 = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
-  arg3 = (std::vector< Dali::Actor > *)jarg3;
+  arg3 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
     return ;
   }
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__InsertRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__InsertRange(arg1,arg2,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26796,16 +21769,16 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_InsertRange(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveAt(void * jarg1, int jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveAt(void * jarg1, int jarg2) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__RemoveAt(arg1,arg2);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__RemoveAt(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26818,18 +21791,18 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveAt(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   int arg3 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   arg3 = (int)jarg3;
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__RemoveRange(arg1,arg2,arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__RemoveRange(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26846,22 +21819,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveRange(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_Repeat(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Actor *arg1 = 0 ;
+  std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
   int arg2 ;
-  std::vector< Dali::Actor > *result = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
 
-  arg1 = (Dali::Actor *)jarg1;
+  arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::pair< unsigned int,Dali::Actor > const & type is null", 0);
     return 0;
   }
   arg2 = (int)jarg2;
   {
     try {
       try {
-        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__Repeat((Dali::Actor const &)*arg1,arg2);
+        result = (std::vector< std::pair< unsigned int,Dali::Actor > > *)std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Repeat((std::pair< unsigned int,Dali::Actor > const &)*arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26876,31 +21849,31 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_Repeat(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Reverse__SWIG_0(void * jarg1) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_0(void * jarg1) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   {
     try {
-      std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_0(arg1);
+      std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Reverse__SWIG_0(arg1);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   int arg3 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
   arg3 = (int)jarg3;
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__Reverse__SWIG_1(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26917,22 +21890,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Reverse__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
-  std::vector< Dali::Actor > *arg3 = 0 ;
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   arg2 = (int)jarg2;
-  arg3 = (std::vector< Dali::Actor > *)jarg3;
+  arg3 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg3;
   if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< std::pair< unsigned int,Dali::Actor > > const & type is null", 0);
     return ;
   }
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__SetRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
+        std_vector_Sl_std_pair_Sl_unsigned_SS_int_Sc_Dali_Actor_Sg__Sg__SetRange(arg1,arg2,(std::vector< std::pair< unsigned int,Dali::Actor > > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -26945,10 +21918,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_SetRange(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorContainer(void * jarg1) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemContainer(void * jarg1) {
+  std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
 
-  arg1 = (std::vector< Dali::Actor > *)jarg1;
+  arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1;
   {
     try {
       delete arg1;
diff --git a/dali-csharp-binder/common/view-wrapper-impl-wrap.cpp b/dali-csharp-binder/common/view-wrapper-impl-wrap.cpp
index de6935a2..4e1a4685 100755
--- a/dali-csharp-binder/common/view-wrapper-impl-wrap.cpp
+++ b/dali-csharp-binder/common/view-wrapper-impl-wrap.cpp
@@ -521,20 +521,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewWrapperImpl_New(char * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewWrapperImpl(void * jarg1) {
-  Dali::Toolkit::Internal::ControlWrapper *arg1 = (Dali::Toolkit::Internal::ControlWrapper *) 0 ;
-
-  arg1 = (Dali::Toolkit::Internal::ControlWrapper *)jarg1;
-  {
-    try {
-      if (arg1)
-      {
-        arg1->Unreference();
-      }
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewWrapperImpl_director_connect(void *objarg, SwigDirector_ViewWrapperImpl::SWIG_Callback0_t callback0, SwigDirector_ViewWrapperImpl::SWIG_Callback1_t callback1, SwigDirector_ViewWrapperImpl::SWIG_Callback2_t callback2, SwigDirector_ViewWrapperImpl::SWIG_Callback3_t callback3, SwigDirector_ViewWrapperImpl::SWIG_Callback4_t callback4, SwigDirector_ViewWrapperImpl::SWIG_Callback5_t callback5, SwigDirector_ViewWrapperImpl::SWIG_Callback6_t callback6, SwigDirector_ViewWrapperImpl::SWIG_Callback9_t callback9, SwigDirector_ViewWrapperImpl::SWIG_Callback11_t callback11, SwigDirector_ViewWrapperImpl::SWIG_Callback12_t callback12, SwigDirector_ViewWrapperImpl::SWIG_Callback13_t callback13, SwigDirector_ViewWrapperImpl::SWIG_Callback14_t callback14, SwigDirector_ViewWrapperImpl::SWIG_Callback15_t callback15, SwigDirector_ViewWrapperImpl::SWIG_Callback16_t callback16, SwigDirector_ViewWrapperImpl::SWIG_Callback17_t callback17, SwigDirector_ViewWrapperImpl::SWIG_Callback18_t callback18, SwigDirector_ViewWrapperImpl::SWIG_Callback19_t callback19, SwigDirector_ViewWrapperImpl::SWIG_Callback20_t callback20, SwigDirector_ViewWrapperImpl::SWIG_Callback21_t callback21, SwigDirector_ViewWrapperImpl::SWIG_Callback24_t callback24, SwigDirector_ViewWrapperImpl::SWIG_Callback25_t callback25, SwigDirector_ViewWrapperImpl::SWIG_Callback26_t callback26, SwigDirector_ViewWrapperImpl::SWIG_Callback28_t callback28, SwigDirector_ViewWrapperImpl::SWIG_Callback29_t callback29, SwigDirector_ViewWrapperImpl::SWIG_Callback30_t callback30, SwigDirector_ViewWrapperImpl::SWIG_Callback31_t callback31, SwigDirector_ViewWrapperImpl::SWIG_Callback32_t callback32, SwigDirector_ViewWrapperImpl::SWIG_Callback33_t callback33, SwigDirector_ViewWrapperImpl::SWIG_Callback34_t callback34, SwigDirector_ViewWrapperImpl::SWIG_Callback35_t callback35, SwigDirector_ViewWrapperImpl::SWIG_Callback36_t callback36, SwigDirector_ViewWrapperImpl::SWIG_Callback37_t callback37, SwigDirector_ViewWrapperImpl::SWIG_Callback38_t callback38, SwigDirector_ViewWrapperImpl::SWIG_Callback39_t callback39, SwigDirector_ViewWrapperImpl::SWIG_Callback40_t callback40) {
@@ -546,25 +532,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewWrapperImpl_director_connect(void *o
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetControlWrapperImpl__SWIG_0(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ControlWrapper *arg1 = 0 ;
-  Dali::Toolkit::Internal::ControlWrapper *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ControlWrapper *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ControlWrapper & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Internal::ControlWrapper *) &Dali::Toolkit::GetControlWrapperImpl(*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewWrapper_New(char * jarg1, void * jarg2) {
@@ -594,19 +561,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewWrapper_New(char * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ViewWrapper__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ControlWrapper *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ControlWrapper *)new Dali::Toolkit::ControlWrapper();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewWrapper(void * jarg1) {
@@ -622,79 +576,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewWrapper(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ViewWrapper__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ControlWrapper *arg1 = 0 ;
-  Dali::Toolkit::ControlWrapper *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ControlWrapper *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ControlWrapper const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ControlWrapper *)new Dali::Toolkit::ControlWrapper((Dali::Toolkit::ControlWrapper const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewWrapper_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::ControlWrapper *arg1 = (Dali::Toolkit::ControlWrapper *) 0 ;
-  Dali::Toolkit::ControlWrapper *arg2 = 0 ;
-  Dali::Toolkit::ControlWrapper *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ControlWrapper *)jarg1;
-  arg2 = (Dali::Toolkit::ControlWrapper *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ControlWrapper const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ControlWrapper *) &(arg1)->operator =((Dali::Toolkit::ControlWrapper const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewWrapper_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ControlWrapper result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ControlWrapper::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = new Dali::Toolkit::ControlWrapper((const Dali::Toolkit::ControlWrapper &)result);
-  return jresult;
-}
 
-SWIGEXPORT Dali::Toolkit::Internal::Control * SWIGSTDCALL CSharp_Dali_ViewWrapperImpl_SWIGUpcast(Dali::Toolkit::Internal::ControlWrapper *jarg1) {
-    return (Dali::Toolkit::Internal::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ViewWrapper_SWIGUpcast(Dali::Toolkit::ControlWrapper *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ViewWrapperImpl_RelayoutRequest(void * jarg1) {
   Dali::Toolkit::Internal::ControlWrapper *arg1 = (Dali::Toolkit::Internal::ControlWrapper *) 0 ;
diff --git a/dali-csharp-binder/dali-adaptor/application-wrap.cpp b/dali-csharp-binder/dali-adaptor/application-wrap.cpp
index 217eb02b..4b444e4e 100644
--- a/dali-csharp-binder/dali-adaptor/application-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/application-wrap.cpp
@@ -196,10 +196,6 @@ extern "C" {
 #endif
 
 /*Application binding*/
-SWIGEXPORT Dali::BaseHandle* SWIGSTDCALL CSharp_Dali_Application_SWIGUpcast(Dali::Application* jarg1)
-{
-  return (Dali::BaseHandle*)jarg1;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_PreInitialize()
 {
@@ -1830,6 +1826,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_New_WithWindowData(int nuiA
   return jresult;
 }
 
+
 SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_Application_GetRenderThreadId(void* jarg1)
 {
   Dali::Application* arg1 = (Dali::Application*)jarg1;
@@ -1843,6 +1840,7 @@ SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_Application_GetRenderThreadId(void* j
   return result;
 }
 
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_FlushUpdateMessages(void* jarg1)
 {
   Dali::Application* arg1 = (Dali::Application*)jarg1;
diff --git a/dali-csharp-binder/dali-adaptor/capture-wrap.cpp b/dali-csharp-binder/dali-adaptor/capture-wrap.cpp
index c1c7cc4b..35f51543 100755
--- a/dali-csharp-binder/dali-adaptor/capture-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/capture-wrap.cpp
@@ -53,27 +53,7 @@ SWIGINTERN void Dali_Capture_Signal_Emit(Dali::Capture::CaptureFinishedSignalTyp
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::BaseHandle* SWIGSTDCALL CSharp_Dali_Capture_Upcast(Dali::Capture* jarg1)
-{
-  return (Dali::BaseHandle*)jarg1;
-}
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Capture()
-{
-  void* jresult;
-  Dali::Capture* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Capture*)new Dali::Capture();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_New()
 {
@@ -92,30 +72,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_New()
   return jresult;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_DownCast(void* jarg1)
-{
-  void* jresult;
-  Dali::BaseHandle arg1;
-  Dali::BaseHandle* argp1;
-  Dali::Capture result;
-
-  argp1 = (Dali::BaseHandle*)jarg1;
-  if (!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = Dali::Capture::DownCast(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = new Dali::Capture((const Dali::Capture&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Capture(void* jarg1)
 {
@@ -131,56 +87,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Capture(void* jarg1)
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_New_With_CameraActor(void* jarg1)
-{
-  void* jresult;
-  Dali::CameraActor* arg1 = 0;
-  Dali::Capture result;
-
-  arg1 = (Dali::CameraActor*)jarg1;
-  if (!arg1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::CameraActor is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Capture::New(*arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Capture((const Dali::Capture&)result);
-  return jresult;
-}
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_Assign(void* jarg1, void* jarg2)
-{
-  void* jresult;
-  Dali::Capture* arg1 = (Dali::Capture*) 0;
-  Dali::Capture* arg2 = 0;
-  Dali::Capture* result = 0;
-
-  arg1 = (Dali::Capture*)jarg1;
-  arg2 = (Dali::Capture*)jarg2;
-
-  if (!arg2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Capture const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (Dali::Capture*) & (arg1)->operator =((Dali::Capture const&) * arg2);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Capture_Start_1(void* nuiCapture, void* nuiSource, void* nuiSize, char* nuiPath, void* nuiClearColor)
 {
@@ -407,32 +314,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Capture_Signal_Emit(void* jarg1, void* j
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Capture_Signal()
-{
-  Dali::Capture::CaptureFinishedSignalType* result = 0;
 
-  {
-    try
-    {
-      result = (Dali::Capture::CaptureFinishedSignalType*)new Dali::Capture::CaptureFinishedSignalType();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-  return (void*)result;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Capture_Signal(void* jarg1)
-{
-  Dali::Capture::CaptureFinishedSignalType* arg1 = (Dali::Capture::CaptureFinishedSignalType*)jarg1;
-
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_Signal_Get(void* jarg1)
 {
@@ -505,28 +387,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_GetNativeImageSource(void* jarg
 typedef char * (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char *);
 extern SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback;
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Capture_GenerateUrl(void* nuiCapture)
-{
-  Dali::Capture* capture = (Dali::Capture*)nuiCapture;
-  Dali::Toolkit::ImageUrl result;
-  void *jresult;
-
-  if (!capture)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "some argument is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Toolkit::Image::GenerateUrl(capture->GetNativeImageSource());
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ImageUrl((const Dali::Toolkit::ImageUrl &)result);
-  return jresult;
-}
 
 SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Capture_GetCapturedBuffer(void *nuiCapture)
 {
diff --git a/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp b/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
index 9a592c6b..f11a6705 100644
--- a/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
@@ -106,21 +106,6 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Clipboard_GetData(void * argClip
   return (unsigned int) id;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clipboard_DataSentSignal(void * argClipboard)
-{
-  Dali::Clipboard *clipboard = (Dali::Clipboard *) 0 ;
-  Dali::Clipboard::DataSentSignalType *signal = 0 ;
-
-  clipboard = (Dali::Clipboard *)argClipboard;
-  {
-    try
-    {
-      signal = (Dali::Clipboard::DataSentSignalType *) &(clipboard)->DataSentSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void *)signal;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clipboard_DataReceivedSignal(void * argClipboard)
 {
diff --git a/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp b/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
index d8815d1a..6f435e7e 100644
--- a/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
@@ -90,19 +90,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetGeometryHittestEnabled(bool enable) {
 
 // Timer
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Timer__SWIG_0() {
-  void * jresult ;
-  Dali::Timer *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Timer *)new Dali::Timer();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_New(unsigned int jarg1) {
@@ -143,27 +130,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Timer__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Timer *arg1 = (Dali::Timer *) 0 ;
-  Dali::Timer *arg2 = 0 ;
-  Dali::Timer *result = 0 ;
-
-  arg1 = (Dali::Timer *)jarg1;
-  arg2 = (Dali::Timer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Timer const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Timer *) &(arg1)->operator =((Dali::Timer const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Timer(void * jarg1) {
@@ -179,27 +145,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Timer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Timer result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Timer::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Timer((const Dali::Timer &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Timer_Start(void * jarg1) {
@@ -405,9 +350,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimerSignalType(void * jarg1) {
 
 // PixelBuffer
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PixelBuffer_SWIGUpcast(Dali::Devel::PixelBuffer *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelBuffer_New(unsigned int jarg1, unsigned int jarg2, int jarg3) {
   void * jresult ;
@@ -428,18 +370,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelBuffer_New(unsigned int jarg1, un
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PixelBuffer__SWIG_0() {
-  void * jresult ;
-  Dali::Devel::PixelBuffer *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Devel::PixelBuffer *)new Dali::Devel::PixelBuffer();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PixelBuffer(void * jarg1) {
@@ -1353,11 +1283,6 @@ struct NativeImageSourcePtrHandle
   NativeImageSourcePtr Ptr;
 };
 
-SWIGEXPORT NativeImageInterface* SWIGSTDCALL CSharp_Dali_NativeImageSource_Upcast(void* jarg1)
-{
-  NativeImageSource* arg1 = (NativeImageSource*)jarg1;
-  return (NativeImageInterface*)(arg1);
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_NativeImageSource_New_Handle(unsigned int jarg1, unsigned int jarg2, int jarg3)
 {
@@ -1520,27 +1445,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageSource_EnableBackBuffer(void*
 /*
  * Widget binding
  */
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Widget_SWIGUpcast(Dali::Widget *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseObject * SWIGSTDCALL CSharp_Dali_WidgetImpl_SWIGUpcast(Dali::Internal::Adaptor::Widget *jarg1) {
-    return (Dali::BaseObject *)jarg1;
-}
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_New__SWIG_0() {
-  void * jresult ;
-  Dali::Widget result;
-
-  {
-    try {
-      result = Dali::Widget::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Widget((const Dali::Widget &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_New__SWIG_1(void * jarg1) {
@@ -1562,18 +1468,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_New__SWIG_1(void * jarg1) {
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Widget() {
-  void * jresult ;
-  Dali::Widget *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Widget *)new Dali::Widget();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_Assign(void * jarg1, void * jarg2) {
@@ -1609,291 +1503,33 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Widget(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnCreate(void * jarg1, char * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Window arg3 ;
-  Dali::Window *argp3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  argp3 = (Dali::Window *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->OnCreate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnCreateSwigExplicitWidgetImpl(void * jarg1, char * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Window arg3 ;
-  Dali::Window *argp3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  argp3 = (Dali::Window *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnCreate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnTerminate(void * jarg1, char * jarg2, int jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Widget::Termination arg3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Widget::Termination)jarg3;
-  {
-    try {
-      (arg1)->OnTerminate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnTerminateSwigExplicitWidgetImpl(void * jarg1, char * jarg2, int jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::Widget::Termination arg3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (Dali::Widget::Termination)jarg3;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnTerminate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnPause(void * jarg1) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  {
-    try {
-      (arg1)->OnPause();
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnPauseSwigExplicitWidgetImpl(void * jarg1) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnPause();
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnResume(void * jarg1) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  {
-    try {
-      (arg1)->OnResume();
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnResumeSwigExplicitWidgetImpl(void * jarg1) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnResume();
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnResize(void * jarg1, void * jarg2) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::Window arg2 ;
-  Dali::Window *argp2 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  argp2 = (Dali::Window *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->OnResize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnResizeSwigExplicitWidgetImpl(void * jarg1, void * jarg2) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::Window arg2 ;
-  Dali::Window *argp2 ;
-
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  argp2 = (Dali::Window *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnResize(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnUpdate(void * jarg1, char * jarg2, int jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  int arg3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (int)jarg3;
-  {
-    try {
-      (arg1)->OnUpdate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_OnUpdateSwigExplicitWidgetImpl(void * jarg1, char * jarg2, int jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  std::string *arg2 = 0 ;
-  int arg3 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  arg3 = (int)jarg3;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::OnUpdate((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
-  {
-    try {
-      (arg1)->SignalConnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_SignalConnectedSwigExplicitWidgetImpl(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::SignalConnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
-  {
-    try {
-      (arg1)->SignalDisconnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_SignalDisconnectedSwigExplicitWidgetImpl(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
-  Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
-  Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
 
-  arg1 = (Dali::Internal::Adaptor::Widget *)jarg1;
-  arg2 = (Dali::SlotObserver *)jarg2;
-  arg3 = (Dali::CallbackBase *)jarg3;
-  {
-    try {
-      (arg1)->Dali::Internal::Adaptor::Widget::SignalDisconnected(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WidgetImpl_SetContentInfo(void * jarg1, char * jarg2) {
   Dali::Internal::Adaptor::Widget *arg1 = (Dali::Internal::Adaptor::Widget *) 0 ;
@@ -2007,18 +1643,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WidgetApplication_New(int jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WidgetApplication__SWIG_0() {
-  void * jresult ;
-  Dali::WidgetApplication *result = 0 ;
-
-  {
-    try {
-      result = (Dali::WidgetApplication *)new Dali::WidgetApplication();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WidgetApplication__SWIG_1(void * jarg1) {
diff --git a/dali-csharp-binder/dali-adaptor/encoded-image-buffer-wrap.cpp b/dali-csharp-binder/dali-adaptor/encoded-image-buffer-wrap.cpp
index b5bc2b2e..6bad51ff 100755
--- a/dali-csharp-binder/dali-adaptor/encoded-image-buffer-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/encoded-image-buffer-wrap.cpp
@@ -28,69 +28,9 @@ extern "C"
 {
 #endif
 
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_EncodedImageBuffer__SWIG_0()
-{
-  void *jresult;
-  Dali::EncodedImageBuffer *result = 0;
-
-  {
-    try
-    {
-      result = new Dali::EncodedImageBuffer();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_EncodedImageBuffer__SWIG_1(void *nuiEncodedImageBuffer)
-{
-  void *jresult;
-  Dali::EncodedImageBuffer *result = (Dali::EncodedImageBuffer *)0;
-  Dali::EncodedImageBuffer *encodedImageBuffer = (Dali::EncodedImageBuffer *)nuiEncodedImageBuffer;;
-
-  if (!encodedImageBuffer)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::EncodedImageBuffer const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = new Dali::EncodedImageBuffer((Dali::EncodedImageBuffer const &)*encodedImageBuffer);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 // note: nuiRawBuffer is same as Dali::Vector<unsigned char>, which created by CSharp_Dali_new_VectorUnsignedChar__SWIG_0
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_EncodedImageBuffer_New(void *nuiRawBuffer)
-{
-  void *jresult;
-  Dali::EncodedImageBuffer::RawBufferType *buffer = (Dali::EncodedImageBuffer::RawBufferType *)nuiRawBuffer;
-  Dali::EncodedImageBuffer result;
-
-  if (!buffer)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null buffer", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::EncodedImageBuffer::New((const Dali::EncodedImageBuffer::RawBufferType &)*buffer);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::EncodedImageBuffer((const Dali::EncodedImageBuffer &)result);
-  return jresult;
-}
 
 // note: nuiRawBuffer is same as Dali::Vector<unsigned char>, which created by CSharp_Dali_new_VectorUnsignedChar__SWIG_0
 SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_EncodedImageBuffer_New__SWIG_1(void *nuiRawBuffer, int nuiImageType)
diff --git a/dali-csharp-binder/dali-adaptor/event-thread-callback-wrap.cpp b/dali-csharp-binder/dali-adaptor/event-thread-callback-wrap.cpp
index 59739cfb..b8e979bd 100755
--- a/dali-csharp-binder/dali-adaptor/event-thread-callback-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/event-thread-callback-wrap.cpp
@@ -69,17 +69,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_EventThreadCallback(SWIG_CallbackM
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_EventThreadCallback(void * jarg1) {
-  Dali::EventThreadCallback *arg1 = (Dali::EventThreadCallback *) 0 ;
-
-  arg1 = (Dali::EventThreadCallback *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_EventThreadCallback_Trigger(void * jarg1) {
diff --git a/dali-csharp-binder/dali-adaptor/font-client-wrap.cpp b/dali-csharp-binder/dali-adaptor/font-client-wrap.cpp
index 51a7153e..5b6f6396 100755
--- a/dali-csharp-binder/dali-adaptor/font-client-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/font-client-wrap.cpp
@@ -57,9 +57,6 @@ extern "C" {
 #endif
 
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_FontClient_SWIGUpcast(Dali::TextAbstraction::FontClient *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FontClient_PreCache(char ** fallbackFamilyArray, int fallbackFamilySize, char ** extraFamilyArray, int extraFamilySize, char * localeFamilyString, bool useThread, bool syncCreation) {
@@ -99,34 +96,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FontClient_FontPreLoad(char ** fontPathA
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FontWidthName_get() {
-  void * jresult ;
-  char **result = 0 ;
-
-  result = (char **)(char **)Dali::TextAbstraction::FontWidth::Name;
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FontWeightName_get() {
-  void * jresult ;
-  char **result = 0 ;
 
-  result = (char **)(char **)Dali::TextAbstraction::FontWeight::Name;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FontSlantName_get() {
-  void * jresult ;
-  char **result = 0 ;
 
-  result = (char **)(char **)Dali::TextAbstraction::FontSlant::Name;
-  jresult = result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FontDescription() {
@@ -435,75 +408,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FontMetrics(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LINE_MUST_BREAK_get() {
-  int jresult ;
-  int result;
 
-  {
-    try {
-      result = (int)Dali::TextAbstraction::LINE_MUST_BREAK;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LINE_ALLOW_BREAK_get() {
-  int jresult ;
-  int result;
 
-  {
-    try {
-      result = (int)Dali::TextAbstraction::LINE_ALLOW_BREAK;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LINE_NO_BREAK_get() {
-  int jresult ;
-  int result;
 
-  {
-    try {
-      result = (int)Dali::TextAbstraction::LINE_NO_BREAK;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WORD_BREAK_get() {
-  int jresult ;
-  int result;
-
-  {
-    try {
-      result = (int)Dali::TextAbstraction::WORD_BREAK;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WORD_NO_BREAK_get() {
-  int jresult ;
-  int result;
-
-  {
-    try {
-      result = (int)Dali::TextAbstraction::WORD_NO_BREAK;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (int)result;
-  return jresult;
-}
-
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorBlob_r_set(void * jarg1, unsigned char jarg2) {
   Dali::TextAbstraction::VectorBlob *arg1 = (Dali::TextAbstraction::VectorBlob *) 0 ;
@@ -875,28 +788,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FontClient_GlyphBufferData(void *
 }
 
 /*
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FontClient_GlyphBufferData_buffer_set(void * jarg1, unsigned char* jarg2) {
-  Dali::TextAbstraction::GlyphBufferData *arg1 = (Dali::TextAbstraction::GlyphBufferData *) 0 ;
-  unsigned char *arg2 = (unsigned char *) 0 ;
-
-  arg1 = (Dali::TextAbstraction::GlyphBufferData *)jarg1;
-  arg2 = jarg2;
-  if (arg1) (arg1)->buffer = arg2;
-
 
-}
-
-
-SWIGEXPORT unsigned char* SWIGSTDCALL CSharp_Dali_FontClient_GlyphBufferData_buffer_get(void * jarg1) {
-  unsigned char* jresult ;
-  Dali::TextAbstraction::GlyphBufferData *arg1 = (Dali::TextAbstraction::GlyphBufferData *) 0 ;
-  unsigned char *result = 0 ;
 
-  arg1 = (Dali::TextAbstraction::GlyphBufferData *)jarg1;
-  result = (unsigned char *) ((arg1)->buffer);
-  jresult = (void *)result;
-  return jresult;
-}
 */
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FontClient_GlyphBufferData_width_set(void * jarg1, unsigned int jarg2) {
@@ -993,37 +886,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FontClient__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FontClient(void * jarg1) {
-  Dali::TextAbstraction::FontClient *arg1 = (Dali::TextAbstraction::FontClient *) 0 ;
 
-  arg1 = (Dali::TextAbstraction::FontClient *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FontClient__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::TextAbstraction::FontClient *arg1 = 0 ;
-  Dali::TextAbstraction::FontClient *result = 0 ;
-
-  arg1 = (Dali::TextAbstraction::FontClient *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TextAbstraction::FontClient const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TextAbstraction::FontClient *)new Dali::TextAbstraction::FontClient((Dali::TextAbstraction::FontClient const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
-
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FontClient_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
diff --git a/dali-csharp-binder/dali-adaptor/gl-window-wrap.cpp b/dali-csharp-binder/dali-adaptor/gl-window-wrap.cpp
index f483c372..c6248c3b 100644
--- a/dali-csharp-binder/dali-adaptor/gl-window-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/gl-window-wrap.cpp
@@ -77,10 +77,6 @@ extern "C"
 #endif
 
   /*Window binding*/
-  SWIGEXPORT Dali::BaseHandle *SWIGSTDCALL CSharp_Dali_GlWindow_SWIGUpcast(Dali::GlWindow *jarg1)
-  {
-    return (Dali::BaseHandle *)jarg1;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_GlWindow_New__SWIG_0()
   {
@@ -144,86 +140,9 @@ extern "C"
     return jresult;
   }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_GlWindow__SWIG_0()
-  {
-    void *jresult;
-    Dali::GlWindow *result = 0;
 
-    {
-      try
-      {
-        result = (Dali::GlWindow *)new Dali::GlWindow();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
 
-    jresult = (void *)result;
-    return jresult;
-  }
-
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GlWindow(void *jarg1)
-  {
-    Dali::GlWindow *arg1 = (Dali::GlWindow *)0;
-
-    arg1 = (Dali::GlWindow *)jarg1;
-    {
-      try
-      {
-        delete arg1;
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_GlWindow__SWIG_1(void *jarg1)
-  {
-    void *jresult;
-    Dali::GlWindow *arg1 = 0;
-    Dali::GlWindow *result = 0;
-
-    arg1 = (Dali::GlWindow *)jarg1;
-    if (!arg1)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GlWindow const & type is null", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = (Dali::GlWindow *)new Dali::GlWindow((Dali::GlWindow const &)*arg1);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
-
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_GlWindow_Assign(void *jarg1, void *jarg2)
-  {
-    void *jresult;
-    Dali::GlWindow *arg1 = (Dali::GlWindow *)0;
-    Dali::GlWindow *arg2 = 0;
-    Dali::GlWindow *result = 0;
-
-    arg1 = (Dali::GlWindow *)jarg1;
-    arg2 = (Dali::GlWindow *)jarg2;
-    if (!arg2)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GlWindow const & type is null", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = (Dali::GlWindow *)&(arg1)->operator=((Dali::GlWindow const &)*arg2);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GlWindow_SetGraphicsConfig(void *jarg1, unsigned int jarg2, unsigned int jarg3, int jarg4, int jarg5)
   {
@@ -869,128 +788,12 @@ extern "C"
     return jresult;
   }
 
-  SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GlWindow_FocusSignalType_Empty(void *jarg1)
-  {
-    unsigned int jresult;
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)0;
-    bool result;
 
-    arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    {
-      try
-      {
-        result = (bool)Dali_Signal_Sl_void_Sp_bool_SP__Sg__Empty((Dali::Signal<void(Dali::GlWindow, bool)> const *)arg1);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
 
-    jresult = result;
-    return jresult;
-  }
-
-  SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_GlWindow_FocusSignalType_GetConnectionCount(void *jarg1)
-  {
-    unsigned long jresult;
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)0;
-    std::size_t result;
-
-    arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    {
-      try
-      {
-        result = Dali_Signal_Sl_void_Sp_bool_SP__Sg__GetConnectionCount((Dali::Signal<void(Dali::GlWindow, bool)> const *)arg1);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (unsigned long)result;
-    return jresult;
-  }
-
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GlWindow_FocusSignalType_Connect(void *jarg1, void *jarg2)
-  {
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)0;
-    void (*arg2)(Dali::GlWindow, bool) = (void (*)(Dali::GlWindow, bool))0;
-
-    arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    arg2 = (void (*)(Dali::GlWindow, bool))jarg2;
-    {
-      try
-      {
-        Dali_Signal_Sl_void_Sp_bool_SP__Sg__Connect(arg1, arg2);
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
-
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GlWindow_FocusSignalType_Disconnect(void *jarg1, void *jarg2)
-  {
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)0;
-    void (*arg2)(Dali::GlWindow, bool) = (void (*)(Dali::GlWindow, bool))0;
-
-    arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    arg2 = (void (*)(Dali::GlWindow, bool))jarg2;
-    {
-      try
-      {
-        Dali_Signal_Sl_void_Sp_bool_SP__Sg__Disconnect(arg1, arg2);
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
-
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GlWindow_FocusSignalType_Emit(void *jarg1, void *jarg2, unsigned int jarg3)
-  {
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    Dali::GlWindow *arg2 = (Dali::GlWindow *)jarg2;
-    bool arg3 = jarg3 ? true : false;
-    ;
 
-    if (arg1 == nullptr || arg2 == nullptr)
-    {
-      DALI_LOG_ERROR("[ERR] arg1 == nullptr or arg2 == nullptr");
-      return;
-    }
 
-    {
-      try
-      {
-        Dali_Signal_Sl_void_Sp_bool_SP__Sg__Emit(arg1, *arg2, arg3);
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_GlWindow_FocusSignalType()
-  {
-    void *jresult;
-    Dali::Signal<void(Dali::GlWindow, bool)> *result = 0;
 
-    {
-      try
-      {
-        result = (Dali::Signal<void(Dali::GlWindow, bool)> *)new Dali::Signal<void(Dali::GlWindow, bool)>();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
-
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GlWindow_FocusSignalType(void *jarg1)
-  {
-    Dali::Signal<void(Dali::GlWindow, bool)> *arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)0;
-
-    arg1 = (Dali::Signal<void(Dali::GlWindow, bool)> *)jarg1;
-    {
-      try
-      {
-        delete arg1;
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
 
   /* Touch Event Binding */
   GENERATE_SIGNAL(Dali::GlWindow*, void(*)(Dali::TouchEvent const&), Dali_GlWindow, TouchedSignal)
diff --git a/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp b/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp
index fc7e131e..8a98eb41 100755
--- a/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp
@@ -130,9 +130,6 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_string_string_string_SP__Sg__Emit(Dali::S
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_InputMethodContext_SWIGUpcast(Dali::InputMethodContext *jarg1) {
-  return (Dali::BaseHandle *)jarg1;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_InputMethodContext_EventData__SWIG_0() {
   void * jresult ;
@@ -454,18 +451,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_InputMethodContext_Finalize(void * csInp
     } CALL_CATCH_EXCEPTION();  }
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_InputMethodContext__SWIG_0() {
-  void * jresult ;
-  Dali::InputMethodContext *inputMethodContext = 0 ;
-
-  {
-    try {
-      inputMethodContext = (Dali::InputMethodContext *)new Dali::InputMethodContext();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)inputMethodContext;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_InputMethodContext(void * csInputMethodContext) {
@@ -1324,110 +1309,20 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyboardEventSignalType(void * ja
 
 
 // VoidSignalType
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VoidSignalType() {
-  void * jresult ;
-  Dali::Signal< void () > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void () > *)new Dali::Signal< void () >();
-    } CALL_CATCH_EXCEPTION(0);  }
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VoidSignalType(void * jarg1) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();  }
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_VoidSignalType_Empty(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  {
-    try {
-      result = (bool)((Dali::Signal< void () > const *)arg1)->Empty();
-    } CALL_CATCH_EXCEPTION(0);  }
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VoidSignalType_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  std::size_t result;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  {
-    try {
-      result = ((Dali::Signal< void () > const *)arg1)->GetConnectionCount();
-    } CALL_CATCH_EXCEPTION(0);  }
-  jresult = (unsigned long)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignalType_Connect__SWIG_0(void * jarg1, void * jarg2) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  void (*arg2)() = (void (*)()) 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (void (*)())jarg2;
-  {
-    try {
-      (arg1)->Connect(arg2);
-    } CALL_CATCH_EXCEPTION();  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignalType_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  void (*arg2)() = (void (*)()) 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (void (*)())jarg2;
-  {
-    try {
-      (arg1)->Disconnect(arg2);
-    } CALL_CATCH_EXCEPTION();  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignalType_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-  Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
-  Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
 
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  arg2 = (Dali::ConnectionTrackerInterface *)jarg2;
-  arg3 = (Dali::FunctorDelegate *)jarg3;
-  {
-    try {
-      (arg1)->Connect(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();  }
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignalType_Emit(void * jarg1) {
-  Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
-
-  arg1 = (Dali::Signal< void () > *)jarg1;
-  {
-    try {
-      (arg1)->Emit();
-    } CALL_CATCH_EXCEPTION();  }
-}
 
 //StatusSignalType
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_StatusSignalType_Empty(void * jarg1) {
diff --git a/dali-csharp-binder/dali-adaptor/native-image-queue-wrap.cpp b/dali-csharp-binder/dali-adaptor/native-image-queue-wrap.cpp
index b6fd03d5..d0dc4b6c 100644
--- a/dali-csharp-binder/dali-adaptor/native-image-queue-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/native-image-queue-wrap.cpp
@@ -31,19 +31,6 @@ struct NativeImageSourceQueuePtrHandle
   Dali::NativeImageSourceQueuePtr Ptr;
 };
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_NativeImageQueuePtr(unsigned int width, unsigned int height, int colorFormat)
-{
-  void* jresult;
-  NativeImageSourceQueuePtrHandle* queue = new NativeImageSourceQueuePtrHandle();
-  {
-    try {
-      queue->Ptr = Dali::NativeImageSourceQueue::New(width, height, (Dali::NativeImageSourceQueue::ColorFormat)colorFormat);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)queue;
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_NativeImageQueuePtr_2(unsigned int queueCount, unsigned int width, unsigned int height, int colorFormat)
 {
diff --git a/dali-csharp-binder/dali-adaptor/tts-player-wrap.cpp b/dali-csharp-binder/dali-adaptor/tts-player-wrap.cpp
index 2f364285..7a11f092 100755
--- a/dali-csharp-binder/dali-adaptor/tts-player-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/tts-player-wrap.cpp
@@ -41,9 +41,6 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_TtsPlayer_State_SS_const_Sc_Dali_Tts
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TtsPlayer_SWIGUpcast(Dali::TtsPlayer *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TtsPlayer__SWIG_0() {
   void * jresult ;
@@ -92,17 +89,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TtsPlayer_Get__SWIG_1() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TtsPlayer(void * jarg1) {
-  Dali::TtsPlayer *arg1 = (Dali::TtsPlayer *) 0 ;
-
-  arg1 = (Dali::TtsPlayer *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TtsPlayer__SWIG_1(void * jarg1) {
diff --git a/dali-csharp-binder/dali-adaptor/watch-wrap.cpp b/dali-csharp-binder/dali-adaptor/watch-wrap.cpp
index 1f919319..b776d36c 100755
--- a/dali-csharp-binder/dali-adaptor/watch-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/watch-wrap.cpp
@@ -443,18 +443,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WatchApplication_New__SWIG_2(int jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WatchApplication__SWIG_0() {
-  void * jresult ;
-  Dali::WatchApplication *result = 0 ;
-
-  {
-    try {
-      result = (Dali::WatchApplication *)new Dali::WatchApplication();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WatchApplication__SWIG_1(void * jarg1) {
@@ -477,26 +465,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WatchApplication__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WatchApplication_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::WatchApplication *arg1 = (Dali::WatchApplication *) 0 ;
-  Dali::WatchApplication *arg2 = 0 ;
-  Dali::WatchApplication *result = 0 ;
-
-  arg1 = (Dali::WatchApplication *)jarg1;
-  arg2 = (Dali::WatchApplication *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WatchApplication const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::WatchApplication *) &(arg1)->operator =((Dali::WatchApplication const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WatchApplication(void * jarg1) {
diff --git a/dali-csharp-binder/dali-adaptor/window-wrap.cpp b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
index 0e7ac822..98543cd2 100644
--- a/dali-csharp-binder/dali-adaptor/window-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
@@ -216,9 +216,6 @@ extern "C" {
 #endif
 
 /*Window binding*/
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Window_SWIGUpcast(Dali::Window *jarg1) {
-  return (Dali::BaseHandle *)jarg1;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_0(void * jarg1, char * jarg2, unsigned int jarg3) {
   void * jresult ;
@@ -258,115 +255,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_0(void * jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_1(void * jarg1, char * jarg2) {
-  void * jresult ;
-  Dali::PositionSize arg1 ;
-  std::string *arg2 = 0 ;
-  Dali::PositionSize *argp1 ;
-  Dali::Window result;
-
-  argp1 = (Dali::PositionSize *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PositionSize", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  {
-    try {
-      result = Dali::Window::New(arg1,(std::string const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Window((const Dali::Window &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_2(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4) {
-  void * jresult ;
-  Dali::PositionSize arg1 ;
-  std::string *arg2 = 0 ;
-  std::string *arg3 = 0 ;
-  bool arg4 ;
-  Dali::PositionSize *argp1 ;
-  Dali::Window result;
-
-  argp1 = (Dali::PositionSize *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PositionSize", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  if (!jarg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg3_str(jarg3);
-  arg3 = &arg3_str;
-  arg4 = jarg4 ? true : false;
-  {
-    try {
-      result = Dali::Window::New(arg1,(std::string const &)*arg2,(std::string const &)*arg3,arg4);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Window((const Dali::Window &)result);
-
-  return jresult;
-}
-
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_3(void * jarg1, char * jarg2, char * jarg3) {
-  void * jresult ;
-  Dali::PositionSize arg1 ;
-  std::string *arg2 = 0 ;
-  std::string *arg3 = 0 ;
-  Dali::PositionSize *argp1 ;
-  Dali::Window result;
 
-  argp1 = (Dali::PositionSize *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PositionSize", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  if (!jarg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg3_str(jarg3);
-  arg3 = &arg3_str;
-  {
-    try {
-      result = Dali::Window::New(arg1,(std::string const &)*arg2,(std::string const &)*arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = new Dali::Window((const Dali::Window &)result);
 
-  return jresult;
-}
 
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Window_New__WithWindowData(char* nuiName, char* nuiClassName, void* nuiWindowData)
@@ -414,19 +306,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Window_New__WithWindowData(char* nuiNam
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Window__SWIG_0() {
-  void * jresult ;
-  Dali::Window *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Window *)new Dali::Window();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Window(void * winHandle) {
@@ -445,48 +324,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Window(void * winHandle) {
 }
 
 // need not sample
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Window__SWIG_1(void * winHandle) {
-  void * jresult ;
-  Dali::Window *window = (Dali::Window *)winHandle;
-  Dali::Window *newWindow = 0 ;
-
-  if(!CheckingWindowHandle(window)) {
-   return 0;
-  }
-  {
-    try {
-      newWindow = (Dali::Window *)new Dali::Window((Dali::Window const &)*window);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)newWindow;
-  return jresult;
-}
 
 // need not sample
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Assign(void * winHandle1, void * winHandle2) {
-  void * jresult ;
-  Dali::Window *window1 = (Dali::Window *) winHandle1;
-  Dali::Window *window2 = (Dali::Window *) winHandle2;
-  Dali::Window *newWindow = 0;
-
-  if(!CheckingWindowHandle(window1)) {
-   return 0;
-  }
-
-  if(!CheckingWindowHandle(window2)) {
-   return 0;
-  }
-
-  {
-    try {
-      newWindow = (Dali::Window *) &(window1)->operator =((Dali::Window const &)*window2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)newWindow;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetClass(void * winHandle, char * pName, char * pClassName) {
@@ -1966,21 +1805,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_InterceptKeyEventSignal(void *
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_TouchSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Window *arg1 = (Dali::Window *) 0 ;
-  Dali::Window::TouchEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Window *)jarg1;
-  {
-    try {
-      result = (Dali::Window::TouchEventSignalType *) &(arg1->TouchedSignal());
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetParent(void* childWinHandle, void* parentWinHandle)
 {
@@ -2170,19 +1994,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Transition_Effect_Event_Signal_Em
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Transition_Effect_Event_Signal_new() {
-  void * jresult ;
-  Dali::Signal< void (Dali::Window, Dali::WindowEffectState, Dali::WindowEffectType) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::Window, Dali::WindowEffectState, Dali::WindowEffectType) > *)new Dali::Signal< void (Dali::Window, Dali::WindowEffectState, Dali::WindowEffectType) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Transition_Effect_Event_Signal_delete(void * jarg1) {
@@ -2398,19 +2209,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Keyboard_Repeat_Settings_Changed_
 
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Keyboard_Repeat_Settings_Changed_Signal_new() {
-  void * jresult ;
-  Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType *result = 0;
-
-  {
-    try {
-      result = (Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType *)new Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Keyboard_Repeat_Settings_Changed_Signal_delete(void * jarg1) {
   Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType *arg1 = (Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType*) 0;
@@ -2604,27 +2402,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_AddFramePresentedCallback( void*
 }
 
 // need not
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPositionSizeWithOrientation(void* winHandle, void* jarg2, int jarg3)
-{
-  Dali::Window *window = (Dali::Window *) winHandle ;
-  if(!CheckingWindowHandle(window)) {
-   return ;
-  }
-
-  Dali::Rect<int>* positionSize = (Dali::Rect<int>*)jarg2;
-  if (!positionSize) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Rect< int > const & type is null", 0);
-    return ;
-  }
-
-  Dali::WindowOrientation orientation = (Dali::WindowOrientation)jarg3;
-  {
-    try {
-      Dali::DevelWindow::SetPositionSizeWithOrientation(*window, *positionSize, orientation);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_RequestMoveToServer(void* winHandle)
 {
@@ -2887,59 +2664,8 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Window_IsWindowRotating(void* winHandle)
   return result;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetLastKeyEvent(void* winHandle)
-{
-  Dali::Window* window = (Dali::Window*)winHandle;
-  void * jresult;
-  Dali::KeyEvent *result = 0;
-  if (!window) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::KeyEvent *)&Dali::DevelWindow::GetLastKeyEvent(*window);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetLastTouchEvent(void* winHandle)
-{
-  Dali::Window* window = (Dali::Window*)winHandle;
-  void * jresult;
-  Dali::TouchEvent *result = 0;
-  if (!window) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::TouchEvent *)&Dali::DevelWindow::GetLastTouchEvent(*window);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetLastHoverEvent(void* winHandle)
-{
-  Dali::Window* window = (Dali::Window*)winHandle;
-  void * jresult;
-  Dali::HoverEvent *result = 0;
-  if (!window) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::HoverEvent *)&Dali::DevelWindow::GetLastHoverEvent(*window);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_InternalRetrievingLastKeyEvent(void* winHandle, void* keyHandle)
 {
@@ -3164,19 +2890,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Moved_Signal_Emit(void * signal, void* w
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Moved_Signal() {
-  void * result ;
-  Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *movedSignal = 0 ;
-
-  {
-    try {
-      movedSignal = (Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *)new Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  result = (void *)movedSignal;
-  return result;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Moved_Signal(void * signal) {
@@ -3304,19 +3017,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Orientation_Changed_Signal_Emit(void * s
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Orientation_Changed_Signal() {
-  void * result ;
-  Dali::Signal< void (Dali::Window, Dali::WindowOrientation) > *orientationChangedSignal = 0 ;
-
-  {
-    try {
-      orientationChangedSignal = (Dali::Signal< void (Dali::Window, Dali::WindowOrientation) > *)new Dali::Signal< void (Dali::Window, Dali::WindowOrientation) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  result = (void *)orientationChangedSignal;
-  return result;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Orientation_Changed_Signal(void * signal) {
@@ -3449,19 +3149,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowMouseInOutEventSignal_Emit(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WindowMouseInOutEventSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseInOutEvent const &) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseInOutEvent const &) > *)new Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseInOutEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WindowMouseInOutEventSignal(void * jarg1) {
@@ -3747,19 +3434,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowMouseRelativeEventSignal_Emit(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WindowMouseRelativeEventSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) > *)new Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WindowMouseRelativeEventSignal(void * jarg1) {
@@ -4189,19 +3863,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_Emit
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WindowPointerConstraintsEventSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)new Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WindowPointerConstraintsEventSignal(void * jarg1) {
@@ -4432,19 +4093,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Move_Completed_Signal_Emit(void * signal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Move_Completed_Signal() {
-  void * result ;
-  Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *moveCompletedSignal = 0 ;
-
-  {
-    try {
-      moveCompletedSignal = (Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *)new Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  result = (void *)moveCompletedSignal;
-  return result;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Move_Completed_Signal(void * signal) {
@@ -4578,19 +4226,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Resize_Completed_Signal_Emit(void * sign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Resize_Completed_Signal() {
-  void * result ;
-  Dali::Signal< void (Dali::Window, Dali::Window::WindowSize) > *resizeCompletedSignal = 0 ;
-
-  {
-    try {
-      resizeCompletedSignal = (Dali::Signal< void (Dali::Window, Dali::Window::WindowSize) > *)new Dali::Signal< void (Dali::Window, Dali::Window::WindowSize) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  result = (void *)resizeCompletedSignal;
-  return result;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Resize_Completed_Signal(void * signal) {
diff --git a/dali-csharp-binder/dali-core/actor-wrap.cpp b/dali-csharp-binder/dali-core/actor-wrap.cpp
index e00a135f..e4042d74 100644
--- a/dali-csharp-binder/dali-core/actor-wrap.cpp
+++ b/dali-csharp-binder/dali-core/actor-wrap.cpp
@@ -435,15 +435,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_BLUE_get()
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_ALPHA_get()
-{
-  int jresult;
-  int result;
-
-  result  = (int)Dali::Actor::Property::COLOR_ALPHA;
-  jresult = (int)result;
-  return jresult;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_COLOR_get()
 {
@@ -525,15 +516,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_INHERIT_SCALE_get()
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_MODE_get()
-{
-  int jresult;
-  int result;
-
-  result  = (int)Dali::Actor::Property::COLOR_MODE;
-  jresult = (int)result;
-  return jresult;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_DRAW_MODE_get()
 {
@@ -605,15 +587,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_HEIGHT_FOR_WIDTH_get()
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PADDING_get()
-{
-  int jresult;
-  int result;
-
-  result  = (int)Dali::Actor::Property::PADDING;
-  jresult = (int)result;
-  return jresult;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_MINIMUM_SIZE_get()
 {
@@ -728,101 +701,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_DISPATCH_HOVER_MOTION_get()
 
 // Creation
 
-SWIGEXPORT Dali::Handle* SWIGSTDCALL CSharp_Dali_Actor_SWIGUpcast(Dali::Actor* jarg1)
-{
-  return (Dali::Handle*)jarg1;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Actor_Property()
-{
-  void*                  jresult;
-  Dali::Actor::Property* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Actor::Property*)new Dali::Actor::Property();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Actor_Property(void* jarg1)
-{
-  Dali::Actor::Property* arg1 = (Dali::Actor::Property*)0;
-
-  arg1 = (Dali::Actor::Property*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Actor__SWIG_0()
-{
-  void*        jresult;
-  Dali::Actor* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Actor*)new Dali::Actor();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_New()
-{
-  void*       jresult;
-  Dali::Actor result;
 
-  {
-    try
-    {
-      result = Dali::Actor::New();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = new Dali::Actor((const Dali::Actor&)result);
-  return jresult;
-}
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_DownCast(void* jarg1)
-{
-  void*             jresult;
-  Dali::BaseHandle  arg1;
-  Dali::BaseHandle* argp1;
-  Dali::Actor       result;
 
-  argp1 = (Dali::BaseHandle*)jarg1;
-  if(!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = Dali::Actor::DownCast(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = new Dali::Actor((const Dali::Actor&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Actor(void* jarg1)
 {
@@ -838,62 +721,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Actor(void* jarg1)
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Actor__SWIG_1(void* jarg1)
-{
-  void*        jresult;
-  Dali::Actor* arg1   = 0;
-  Dali::Actor* result = 0;
-
-  arg1 = (Dali::Actor*)jarg1;
-  if(!arg1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (Dali::Actor*)new Dali::Actor((Dali::Actor const&)*arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_Assign(void* jarg1, void* jarg2)
-{
-  void*        jresult;
-  Dali::Actor* arg1   = (Dali::Actor*)0;
-  Dali::Actor* arg2   = 0;
-  Dali::Actor* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  if(!jarg2)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg2 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  arg2 = (Dali::Actor*)jarg2;
-  {
-    try
-    {
-      result = (Dali::Actor*)&(arg1)->operator=((Dali::Actor const&)*arg2);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void*)result;
-  return jresult;
-}
 
 // Method
 
@@ -1029,30 +857,6 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_OnStage(void* jarg1)
   return jresult;
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_IsLayer(void* jarg1)
-{
-  bool         jresult;
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  bool         result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (bool)((Dali::Actor const*)arg1)->GetProperty<bool>(Actor::Property::IS_LAYER);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetLayer(void* jarg1)
 {
@@ -1133,50 +937,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_Remove(void* jarg1, void* jarg2)
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_Unparent(void* jarg1)
-{
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      (arg1)->Unparent();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_GetChildCount(void* jarg1)
-{
-  unsigned int jresult;
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  unsigned int result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (unsigned int)((Dali::Actor const*)arg1)->GetChildCount();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetChildAt(void* jarg1, unsigned int jarg2)
 {
@@ -1320,30 +1081,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetParentOrigin(void* jarg1, void*
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentParentOrigin(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::PARENT_ORIGIN);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint(void* jarg1, void* jarg2)
 {
@@ -1372,30 +1109,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint(void* jarg1, void*
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentAnchorPoint(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_0(void* jarg1, float jarg2, float jarg3)
 {
@@ -1501,30 +1214,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_3(void* jarg1, void*
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetTargetSize(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetTargetSize();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentSize(void* jarg1)
 {
@@ -1746,55 +1435,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_TranslateBy(void* jarg1, void* jar
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentPosition(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::POSITION);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldPosition(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetInheritPosition(void* jarg1, bool jarg2)
 {
@@ -2206,82 +1847,34 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetScale__SWIG_2(void* jarg1, void
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_ScaleBy(void* jarg1, void* jarg2)
-{
-  Dali::Actor*   arg1 = (Dali::Actor*)0;
-  Dali::Vector3* arg2 = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  arg2 = (Dali::Vector3*)jarg2;
-  if(!arg2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return;
-  }
-  {
-    try
-    {
-      (arg1)->ScaleBy((Dali::Vector3 const&)*arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentScale(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::SCALE);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldScale(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
+{
+  Dali::Actor*   arg1 = (Dali::Actor*)0;
+  Dali::Vector3* arg2 = 0;
 
   if(!jarg1)
   {
     SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
+    return;
   }
 
   arg1 = (Dali::Actor*)jarg1;
+  arg2 = (Dali::Vector3*)jarg2;
+  if(!arg2)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return;
+  }
   {
     try
     {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector3>(Actor::Property::WORLD_SCALE);
+      (arg1)->ScaleBy((Dali::Vector3 const&)*arg2);
     }
-    CALL_CATCH_EXCEPTION(0);
+    CALL_CATCH_EXCEPTION();
   }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
 }
 
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetInheritScale(void* jarg1, bool jarg2)
 {
   Dali::Actor* arg1 = (Dali::Actor*)0;
@@ -2619,30 +2212,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColor(void* jarg1, void* jarg2)
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentColor(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector4 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector4>(Actor::Property::COLOR);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector4((const Dali::Vector4&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColorMode(void* jarg1, int jarg2)
 {
@@ -2691,30 +2260,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetColorMode(void* jarg1)
   return jresult;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldColor(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector4 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetCurrentProperty<Vector4>(Actor::Property::WORLD_COLOR);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector4((const Dali::Vector4&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetDrawMode(void* jarg1, int jarg2)
 {
@@ -2763,52 +2308,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetDrawMode(void* jarg1)
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSensitive(void* jarg1, bool jarg2)
-{
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  bool         arg2;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try
-    {
-      (arg1)->SetProperty(Actor::Property::SENSITIVE, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_IsSensitive(void* jarg1)
-{
-  bool         jresult;
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  bool         result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (bool)((Dali::Actor const*)arg1)->GetProperty<bool>(Actor::Property::SENSITIVE);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_ScreenToLocal(void* jarg1, float* jarg2, float* jarg3, float jarg4, float jarg5)
 {
@@ -2843,52 +2343,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_ScreenToLocal(void* jarg1, float*
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetLeaveRequired(void* jarg1, bool jarg2)
-{
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  bool         arg2;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try
-    {
-      (arg1)->SetProperty(Actor::Property::LEAVE_REQUIRED, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Actor_GetLeaveRequired(void* jarg1)
-{
-  bool         jresult;
-  Dali::Actor* arg1 = (Dali::Actor*)0;
-  bool         result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (bool)((Dali::Actor const*)arg1)->GetProperty<bool>(Actor::Property::LEAVE_REQUIRED);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetKeyboardFocusable(void* jarg1, bool jarg2)
 {
@@ -3077,52 +2532,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetResizePolicy(void* jarg1, int ja
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSizeScalePolicy(void* jarg1, int jarg2)
-{
-  Dali::Actor*                arg1 = (Dali::Actor*)0;
-  Dali::SizeScalePolicy::Type arg2;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  arg2 = (Dali::SizeScalePolicy::Type)jarg2;
-  {
-    try
-    {
-      (arg1)->SetProperty(Actor::Property::SIZE_SCALE_POLICY, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetSizeScalePolicy(void* jarg1)
-{
-  int                         jresult;
-  Dali::Actor*                arg1 = (Dali::Actor*)0;
-  Dali::SizeScalePolicy::Type result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::SizeScalePolicy::Type)((Dali::Actor const*)arg1)->GetProperty<SizeScalePolicy::Type>(Actor::Property::SIZE_SCALE_POLICY);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (int)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSizeModeFactor(void* jarg1, void* jarg2)
 {
@@ -3151,30 +2561,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSizeModeFactor(void* jarg1, voi
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetSizeModeFactor(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector3 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = ((Dali::Actor const*)arg1)->GetProperty<Vector3>(Actor::Property::SIZE_MODE_FACTOR);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector3((const Dali::Vector3&)result);
-  return jresult;
-}
 
 SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetHeightForWidth(void* jarg1, float jarg2)
 {
@@ -3338,30 +2724,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetMinimumSize(void* jarg1, void*
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetMinimumSize(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector2 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (arg1)->GetProperty<Vector2>(Actor::Property::MINIMUM_SIZE);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetMaximumSize(void* jarg1, void* jarg2)
 {
@@ -3390,30 +2752,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetMaximumSize(void* jarg1, void*
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_GetMaximumSize(void* jarg1)
-{
-  void*         jresult;
-  Dali::Actor*  arg1 = (Dali::Actor*)0;
-  Dali::Vector2 result;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (arg1)->GetProperty<Vector2>(Actor::Property::MAXIMUM_SIZE);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2&)result);
-  return jresult;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetHierarchyDepth(void* jarg1)
 {
@@ -3761,24 +3099,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_DevelActor_Property_GetTouchAreaOffset(void*
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_UnparentAndReset(void* jarg1)
-{
-  Dali::Actor* arg1 = 0;
-
-  arg1 = (Dali::Actor*)jarg1;
-  if(!arg1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor & type is null", 0);
-    return;
-  }
-  {
-    try
-    {
-      Dali::UnparentAndReset(*arg1);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 
 SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetSuggestedMinimumWidth(void * jarg1) {
diff --git a/dali-csharp-binder/dali-core/animation-wrap.cpp b/dali-csharp-binder/dali-core/animation-wrap.cpp
index e8730f3c..dd9459b1 100755
--- a/dali-csharp-binder/dali-core/animation-wrap.cpp
+++ b/dali-csharp-binder/dali-core/animation-wrap.cpp
@@ -42,23 +42,7 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Animation_SA__SP__Sg__Emit(Dali::Sig
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Animation_SWIGUpcast(Dali::Animation *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Animation__SWIG_0() {
-  void * jresult ;
-  Dali::Animation *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Animation *)new Dali::Animation();
-    } CALL_CATCH_EXCEPTION(0);
 
-  }
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_New(float jarg1) {
@@ -78,27 +62,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_New(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Animation result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Animation::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-
-  }
-  jresult = new Dali::Animation((const Dali::Animation &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Animation(void * jarg1) {
diff --git a/dali-csharp-binder/dali-core/constraint-wrap.cpp b/dali-csharp-binder/dali-core/constraint-wrap.cpp
index a62bd642..518f7d78 100755
--- a/dali-csharp-binder/dali-core/constraint-wrap.cpp
+++ b/dali-csharp-binder/dali-core/constraint-wrap.cpp
@@ -124,47 +124,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Constraint_Remove(void * nuiConstraint)
   }
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Constraint_REMOVE_ACTION_BAKE_get()
-{
-  int jresult = 0;
-
-  {
-    try
-    {
-      jresult = (int)Dali::Constraint::BAKE;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Constraint_REMOVE_ACTION_DISCARD_get()
-{
-  int jresult = 0;
 
-  {
-    try
-    {
-      jresult = (int)Dali::Constraint::DISCARD;
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  return jresult;
-}
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Constraint_DEFAULT_REMOVE_ACTION_get()
-{
-  int jresult = 0;
-
-  {
-    try
-    {
-      jresult = (int)Dali::Constraint::DEFAULT_REMOVE_ACTION;
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Constraint_SetRemoveAction(void * nuiConstraint, int nuiRemoveAction)
 {
@@ -300,29 +261,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Constraint_GetTargetProperty(void * nuiCo
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Constraint(void * nuiConstraint)
-{
-  Dali::Constraint *constraint = (Dali::Constraint *) 0;
-  Dali::Constraint *result;
-  void * jresult;
-
-  constraint = (Dali::Constraint *)nuiConstraint;
-  if (!constraint)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Constraint is null", 0);
-    return 0;
-  }
-
-  {
-    try
-    {
-      result = new Dali::Constraint(*constraint);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Constraint(void * nuiConstraint)
 {
diff --git a/dali-csharp-binder/dali-core/dali-core-wrap.cpp b/dali-csharp-binder/dali-core/dali-core-wrap.cpp
index f9a64d18..407c2cc5 100644
--- a/dali-csharp-binder/dali-core/dali-core-wrap.cpp
+++ b/dali-csharp-binder/dali-core/dali-core-wrap.cpp
@@ -1897,54 +1897,14 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_10000_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_get() {
-  float jresult ;
-  float result;
-
-  result = (float)(float)Dali::Math::PI;
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_2_get() {
-  float jresult ;
-  float result;
-
-  result = (float)(float)Dali::Math::PI_2;
-  jresult = result;
-  return jresult;
-}
-
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_4_get() {
-  float jresult ;
-  float result;
 
-  result = (float)(float)Dali::Math::PI_4;
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_OVER_180_get() {
-  float jresult ;
-  float result;
 
-  result = (float)(float)Dali::Math::PI_OVER_180;
-  jresult = result;
-  return jresult;
-}
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ONE80_OVER_PI_get() {
-  float jresult ;
-  float result;
 
-  result = (float)(float)Dali::Math::ONE80_OVER_PI;
-  jresult = result;
-  return jresult;
-}
 
 
 
@@ -2421,29 +2381,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorVector2_Size(void * jarg1) {
   return size;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_BaseType_get() {
-  int jresult;
-  int result;
-
-  result = (int)Dali::Vector<uint32_t>::BaseType;
-  jresult = (int)result;
-  return jresult;
-}
-
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_VectorUnsignedInteger__SWIG_0() {
-  void *jresult;
-  Dali::Vector<uint32_t> *result = 0;
 
-  {
-    try {
-      result = (Dali::Vector<uint32_t> *)new Dali::Vector<uint32_t>();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL
 CSharp_Dali_delete_VectorUnsignedInteger(void *jarg1) {
@@ -2588,43 +2526,7 @@ CSharp_Dali_VectorUnsignedInteger_PushBack(void *jarg1, uint32_t jarg2) {
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Insert__SWIG_0(
-    void *jarg1, uint32_t *jarg2, uint32_t jarg3) {
-  Dali::Vector<uint32_t> *arg1 = (Dali::Vector<uint32_t> *)0;
-  Dali::Vector<uint32_t>::Iterator arg2 = (Dali::Vector<uint32_t>::Iterator)0;
-  Dali::Vector<uint32_t>::ItemType *arg3 = 0;
-  Dali::Vector<uint32_t>::ItemType temp3;
-
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  arg2 = jarg2;
-  temp3 = (Dali::Vector<uint32_t>::ItemType)jarg3;
-  arg3 = &temp3;
-  {
-    try {
-      (arg1)->Insert(arg2, (Dali::Vector<uint32_t>::ItemType const &)*arg3);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Insert__SWIG_1(
-    void *jarg1, uint32_t *jarg2, void *jarg3, void *jarg4) {
-  Dali::Vector<uint32_t> *arg1 = (Dali::Vector<uint32_t> *)0;
-  Dali::Vector<uint32_t>::Iterator arg2 = (Dali::Vector<uint32_t>::Iterator)0;
-  Dali::Vector<uint32_t>::Iterator arg3 = (Dali::Vector<uint32_t>::Iterator)0;
-  Dali::Vector<uint32_t>::Iterator arg4 = (Dali::Vector<uint32_t>::Iterator)0;
 
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  arg2 = jarg2;
-  arg3 = (Dali::Vector<uint32_t>::Iterator)jarg3;
-  arg4 = (Dali::Vector<uint32_t>::Iterator)jarg4;
-  {
-    try {
-      (arg1)->Insert(arg2, arg3, arg4);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void SWIGSTDCALL
 CSharp_Dali_VectorUnsignedInteger_Reserve(void *jarg1, unsigned long jarg2) {
@@ -2641,39 +2543,7 @@ CSharp_Dali_VectorUnsignedInteger_Reserve(void *jarg1, unsigned long jarg2) {
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Resize__SWIG_0(
-    void *jarg1, unsigned long jarg2) {
-  Dali::Vector<uint32_t> *arg1 = (Dali::Vector<uint32_t> *)0;
-  Dali::Vector<uint32_t>::SizeType arg2;
-
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  arg2 = (Dali::Vector<uint32_t>::SizeType)jarg2;
-  {
-    try {
-      (arg1)->Resize(arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Resize__SWIG_1(
-    void *jarg1, unsigned long jarg2, uint32_t jarg3) {
-  Dali::Vector<uint32_t> *arg1 = (Dali::Vector<uint32_t> *)0;
-  Dali::Vector<uint32_t>::SizeType arg2;
-  Dali::Vector<uint32_t>::ItemType *arg3 = 0;
-  Dali::Vector<uint32_t>::ItemType temp3;
 
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  arg2 = (Dali::Vector<uint32_t>::SizeType)jarg2;
-  temp3 = (Dali::Vector<uint32_t>::ItemType)jarg3;
-  arg3 = &temp3;
-  {
-    try {
-      (arg1)->Resize(arg2, (Dali::Vector<uint32_t>::ItemType const &)*arg3);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void *SWIGSTDCALL
 CSharp_Dali_VectorUnsignedInteger_Erase__SWIG_0(void *jarg1, uint32_t *jarg2) {
@@ -2696,28 +2566,6 @@ CSharp_Dali_VectorUnsignedInteger_Erase__SWIG_0(void *jarg1, uint32_t *jarg2) {
   return jresult;
 }
 
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Erase__SWIG_1(
-    void *jarg1, uint32_t *jarg2, void *jarg3) {
-  void *jresult;
-  Dali::Vector<uint32_t> *arg1 = (Dali::Vector<uint32_t> *)0;
-  Dali::Vector<uint32_t>::Iterator arg2 = (Dali::Vector<uint32_t>::Iterator)0;
-  Dali::Vector<uint32_t>::Iterator arg3 = (Dali::Vector<uint32_t>::Iterator)0;
-  Dali::Vector<uint32_t>::Iterator result;
-
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  arg2 = jarg2;
-  arg3 = (Dali::Vector<uint32_t>::Iterator)jarg3;
-  {
-    try {
-      result = (Dali::Vector<uint32_t>::Iterator)(arg1)->Erase(arg2, arg3);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL
 CSharp_Dali_VectorUnsignedInteger_Remove(void *jarg1, uint32_t *jarg2) {
@@ -2781,19 +2629,6 @@ CSharp_Dali_VectorUnsignedInteger_Release(void *jarg1) {
   }
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUnsignedInteger_Size(void *jarg1) {
-  Dali::Vector< uint32_t > *arg1 = (Dali::Vector< uint32_t > *) 0 ;
-  int size;
-
-  arg1 = (Dali::Vector<uint32_t> *)jarg1;
-  {
-    try {
-      size = (arg1)->Size();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return size;
-}
 
 
 #ifdef __cplusplus
diff --git a/dali-csharp-binder/dali-core/gestures-wrap.cpp b/dali-csharp-binder/dali-core/gestures-wrap.cpp
index 7e51dc45..d136370a 100755
--- a/dali-csharp-binder/dali-core/gestures-wrap.cpp
+++ b/dali-csharp-binder/dali-core/gestures-wrap.cpp
@@ -54,20 +54,6 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_RotationGesture_SS_con
   self->Emit( arg1, arg2 );
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RotationGestureDetector__SWIG_0()
-{
-  void * jresult ;
-  Dali::RotationGestureDetector *result = 0 ;
-
-  {
-    try {
-      result = (Dali::RotationGestureDetector *)new Dali::RotationGestureDetector();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGestureDetector_New() {
   void * jresult ;
@@ -84,27 +70,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGestureDetector_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGestureDetector_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::RotationGestureDetector result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::RotationGestureDetector::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::RotationGestureDetector((const Dali::RotationGestureDetector &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RotationGestureDetector(void * jarg1) {
@@ -181,19 +146,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGestureDetector_DetectedSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RotationGesture__SWIG_0() {
-  void * jresult ;
-  Dali::RotationGesture *result = 0 ;
-
-  {
-    try {
-      result = (Dali::RotationGesture *)new Dali::RotationGesture();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGesture_New(int jarg1) {
@@ -213,48 +165,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGesture_New(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RotationGesture__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::RotationGesture *arg1 = 0 ;
-  Dali::RotationGesture *result = 0 ;
-
-  arg1 = (Dali::RotationGesture *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RotationGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::RotationGesture *)new Dali::RotationGesture((Dali::RotationGesture const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGesture_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::RotationGesture *arg1 = (Dali::RotationGesture *) 0 ;
-  Dali::RotationGesture *arg2 = 0 ;
-  Dali::RotationGesture *result = 0 ;
 
-  arg1 = (Dali::RotationGesture *)jarg1;
-  arg2 = (Dali::RotationGesture *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RotationGesture const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::RotationGesture *) &(arg1)->operator =((Dali::RotationGesture const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RotationGesture(void * jarg1) {
@@ -428,13 +340,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RotationGestureDetectedSignal(voi
 
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_RotationGestureDetector_SWIGUpcast(Dali::RotationGestureDetector *jarg1) {
-    return (Dali::GestureDetector *)jarg1;
-}
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_RotationGesture_SWIGUpcast(Dali::RotationGesture *jarg1) {
-    return (Dali::Gesture *)jarg1;
-}
 
 #ifdef __cplusplus
 }
diff --git a/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp b/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp
index 37daee5c..ab25b238 100755
--- a/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp
+++ b/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp
@@ -334,6 +334,7 @@ extern "C"
     return (int)InternalPropertyReturnType::NO_ERROR;
   }
 
+
   SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingPropertyFloat(void *actor, int propertyType, float *valFloat)
   {
     Dali::Actor *pActor = (Dali::Actor *)actor;
@@ -358,6 +359,7 @@ extern "C"
     return (int)InternalPropertyReturnType::NO_ERROR;
   }
 
+
   SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_InternalGetPropertyFloat(void *actor, int propertyType)
   {
     Dali::Actor *pActor = (Dali::Actor *)actor;
diff --git a/dali-csharp-binder/dali-core/layer-wrap.cpp b/dali-csharp-binder/dali-core/layer-wrap.cpp
index 771fa15e..d1452f9d 100644
--- a/dali-csharp-binder/dali-core/layer-wrap.cpp
+++ b/dali-csharp-binder/dali-core/layer-wrap.cpp
@@ -31,25 +31,7 @@ extern "C" {
 
 // Property
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_ENABLE_get()
-{
-  int jresult;
-  int result;
-
-  result  = (int)Dali::Layer::Property::CLIPPING_ENABLE;
-  jresult = (int)result;
-  return jresult;
-}
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_BOX_get()
-{
-  int jresult;
-  int result;
-
-  result  = (int)Dali::Layer::Property::CLIPPING_BOX;
-  jresult = (int)result;
-  return jresult;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_BEHAVIOR_get()
 {
@@ -63,58 +45,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_BEHAVIOR_get()
 
 // Creation
 
-SWIGEXPORT Dali::Actor* SWIGSTDCALL CSharp_Dali_Layer_SWIGUpcast(Dali::Layer* jarg1)
-{
-  return (Dali::Actor*)jarg1;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Layer_Property()
-{
-  void*                  jresult;
-  Dali::Layer::Property* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Layer::Property*)new Dali::Layer::Property();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Layer_Property(void* jarg1)
-{
-  Dali::Layer::Property* arg1 = (Dali::Layer::Property*)0;
-
-  arg1 = (Dali::Layer::Property*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Layer__SWIG_0()
-{
-  void*        jresult;
-  Dali::Layer* result = 0;
 
-  {
-    try
-    {
-      result = (Dali::Layer*)new Dali::Layer();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void*)result;
-  return jresult;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Layer_New()
 {
@@ -133,31 +66,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Layer_New()
   return jresult;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Layer_DownCast(void* jarg1)
-{
-  void*             jresult;
-  Dali::BaseHandle  arg1;
-  Dali::BaseHandle* argp1;
-  Dali::Layer       result;
-
-  argp1 = (Dali::BaseHandle*)jarg1;
-  if(!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = Dali::Layer::DownCast(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Layer((const Dali::Layer&)result);
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Layer(void* jarg1)
 {
@@ -173,150 +81,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Layer(void* jarg1)
   }
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Layer__SWIG_1(void* jarg1)
-{
-  void*        jresult;
-  Dali::Layer* arg1   = 0;
-  Dali::Layer* result = 0;
-
-  arg1 = (Dali::Layer*)jarg1;
-  if(!arg1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Layer const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (Dali::Layer*)new Dali::Layer((Dali::Layer const&)*arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Layer_Assign(void* jarg1, void* jarg2)
-{
-  void*        jresult;
-  Dali::Layer* arg1   = (Dali::Layer*)0;
-  Dali::Layer* arg2   = 0;
-  Dali::Layer* result = 0;
 
-  arg1 = (Dali::Layer*)jarg1;
-  arg2 = (Dali::Layer*)jarg2;
-  if(!arg2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Layer const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (Dali::Layer*)&(arg1)->operator=((Dali::Layer const&)*arg2);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
 
 // Method
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_GetDepth(void* jarg1)
-{
-  unsigned int jresult;
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  unsigned int result;
 
-  arg1 = (Dali::Layer*)jarg1;
-  {
-    try
-    {
-      result = (unsigned int)((Dali::Layer const*)arg1)->GetProperty<int>(Layer::Property::DEPTH);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_Raise(void* jarg1)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-
-  arg1 = (Dali::Layer*)jarg1;
-  {
-    try
-    {
-      (arg1)->Raise();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_Lower(void* jarg1)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-
-  arg1 = (Dali::Layer*)jarg1;
-  {
-    try
-    {
-      (arg1)->Lower();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_RaiseAbove(void* jarg1, void* jarg2)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  Dali::Layer  arg2;
-  Dali::Layer* argp2;
-
-  arg1  = (Dali::Layer*)jarg1;
-  argp2 = (Dali::Layer*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Layer", 0);
-    return;
-  }
-  arg2 = *argp2;
-  {
-    try
-    {
-      (arg1)->RaiseAbove(arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_LowerBelow(void* jarg1, void* jarg2)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  Dali::Layer  arg2;
-  Dali::Layer* argp2;
-
-  arg1  = (Dali::Layer*)jarg1;
-  argp2 = (Dali::Layer*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Layer", 0);
-    return;
-  }
-  arg2 = *argp2;
-  {
-    try
-    {
-      (arg1)->LowerBelow(arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_RaiseToTop(void* jarg1)
 {
@@ -462,27 +234,6 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Layer_IsClipping(void* jarg1)
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetClippingBox__SWIG_0(void* jarg1, int jarg2, int jarg3, int jarg4, int jarg5)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  int          arg2;
-  int          arg3;
-  int          arg4;
-  int          arg5;
-
-  arg1 = (Dali::Layer*)jarg1;
-  arg2 = (int)jarg2;
-  arg3 = (int)jarg3;
-  arg4 = (int)jarg4;
-  arg5 = (int)jarg5;
-  {
-    try
-    {
-      (arg1)->SetProperty(Dali::Layer::Property::CLIPPING_BOX, Rect<int32_t>(arg2, arg3, arg4, arg5));
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetClippingBox__SWIG_1(void* jarg1, void* jarg2)
 {
@@ -526,40 +277,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Layer_GetClippingBox(void* jarg1)
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetDepthTestDisabled(void* jarg1, bool jarg2)
-{
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  bool         arg2;
 
-  arg1 = (Dali::Layer*)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try
-    {
-      (arg1)->SetProperty(Layer::Property::DEPTH_TEST, !arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Layer_IsDepthTestDisabled(void* jarg1)
-{
-  bool         jresult;
-  Dali::Layer* arg1 = (Dali::Layer*)0;
-  bool         result;
-
-  arg1 = (Dali::Layer*)jarg1;
-  {
-    try
-    {
-      result = !(bool)((Dali::Layer const*)arg1)->GetProperty<bool>(Layer::Property::DEPTH_TEST);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetSortFunction(void* jarg1, void* jarg2)
 {
diff --git a/dali-csharp-binder/dali-core/ref-object-wrap.cpp b/dali-csharp-binder/dali-core/ref-object-wrap.cpp
index 9fe5bd53..5bc733a2 100644
--- a/dali-csharp-binder/dali-core/ref-object-wrap.cpp
+++ b/dali-csharp-binder/dali-core/ref-object-wrap.cpp
@@ -56,9 +56,6 @@ extern "C" {
 
 // Creation
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_BaseObject_SWIGUpcast(Dali::BaseObject *jarg1) {
-    return (Dali::RefObject *)jarg1;
-}
 
 
 SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_GetRefObjectPtr(Dali::BaseHandle *arg1) {
diff --git a/dali-csharp-binder/dali-core/vector-wrap.cpp b/dali-csharp-binder/dali-core/vector-wrap.cpp
index a066fd11..31b5d6e1 100644
--- a/dali-csharp-binder/dali-core/vector-wrap.cpp
+++ b/dali-csharp-binder/dali-core/vector-wrap.cpp
@@ -189,71 +189,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_0(void * jarg1, float* jarg2) {
-  void * jresult ;
-  Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
-  float *arg2 = (float *) 0 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::Vector2 *)jarg1;
-  arg2 = jarg2;
-  {
-    try {
-      result = (Dali::Vector2 *) &(arg1)->operator =((float const *)arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Vector2 *result = 0 ;
-
-  arg1 = (Dali::Vector2 *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector2 *) &(arg1)->operator =((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_2(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-  Dali::Vector2 *result = 0 ;
 
-  arg1 = (Dali::Vector2 *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector2 *) &(arg1)->operator =((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Add(void * jarg1, void * jarg2) {
@@ -1050,71 +989,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_0(void * jarg1, float* jarg2) {
-  void * jresult ;
-  Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
-  float *arg2 = (float *) 0 ;
-  Dali::Vector3 *result = 0 ;
-
-  arg1 = (Dali::Vector3 *)jarg1;
-  arg2 = jarg2;
-  {
-    try {
-      result = (Dali::Vector3 *) &(arg1)->operator =((float const *)arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
 
 
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  Dali::Vector3 *result = 0 ;
-
-  arg1 = (Dali::Vector3 *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector3 *) &(arg1)->operator =((Dali::Vector2 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_2(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-  Dali::Vector3 *result = 0 ;
-
-  arg1 = (Dali::Vector3 *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector3 *) &(arg1)->operator =((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Add(void * jarg1, void * jarg2) {
@@ -2096,71 +1974,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_0(void * jarg1, float* jarg2) {
-  void * jresult ;
-  Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
-  float *arg2 = (float *) 0 ;
-  Dali::Vector4 *result = 0 ;
-
-  arg1 = (Dali::Vector4 *)jarg1;
-  arg2 = jarg2;
-  {
-    try {
-      result = (Dali::Vector4 *) &(arg1)->operator =((float const *)arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
 
 
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_1(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  Dali::Vector4 *result = 0 ;
-
-  arg1 = (Dali::Vector4 *)jarg1;
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector4 *) &(arg1)->operator =((Dali::Vector2 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_2(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
-  Dali::Vector3 *arg2 = 0 ;
-  Dali::Vector4 *result = 0 ;
-
-  arg1 = (Dali::Vector4 *)jarg1;
-  arg2 = (Dali::Vector3 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Vector4 *) &(arg1)->operator =((Dali::Vector3 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Add(void * jarg1, void * jarg2) {
diff --git a/dali-csharp-binder/dali-physics-2d/physics-actor-2d-wrap.cpp b/dali-csharp-binder/dali-physics-2d/physics-actor-2d-wrap.cpp
index 4ce7acbd..5360dfc3 100644
--- a/dali-csharp-binder/dali-physics-2d/physics-actor-2d-wrap.cpp
+++ b/dali-csharp-binder/dali-physics-2d/physics-actor-2d-wrap.cpp
@@ -29,22 +29,6 @@ extern "C" {
   using Dali::Toolkit::Physics::PhysicsActor;
   using Dali::Toolkit::Physics::PhysicsAdaptor;
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_PhysicsActor__SWIG_0()
-  {
-    void*        jresult;
-    PhysicsActor* result = 0;
-
-    {
-      try
-      {
-        result = (PhysicsActor*)new PhysicsActor();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void*)result;
-    return jresult;
-  }
 
   SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsActor_New(void* csActor, void* csBody, void* csAdaptor)
   {
@@ -79,25 +63,6 @@ extern "C" {
     return new PhysicsActor((const PhysicsActor&)result);
   }
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsActor_DownCast(void* csHandle)
-  {
-    Dali::BaseHandle* handle = (Dali::BaseHandle*)csHandle;
-    PhysicsActor result;
-
-    if(!handle)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = PhysicsActor::DownCast(*handle);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-    return new PhysicsActor((const PhysicsActor&)result);
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PhysicsActor(void* csPhysicsActor)
   {
diff --git a/dali-csharp-binder/dali-physics-2d/physics-adaptor-2d-wrap.cpp b/dali-csharp-binder/dali-physics-2d/physics-adaptor-2d-wrap.cpp
index 12308c16..7ab3c7b8 100644
--- a/dali-csharp-binder/dali-physics-2d/physics-adaptor-2d-wrap.cpp
+++ b/dali-csharp-binder/dali-physics-2d/physics-adaptor-2d-wrap.cpp
@@ -32,22 +32,6 @@ extern "C" {
   using Dali::Toolkit::Physics::PhysicsActor;
   using Dali::Toolkit::Physics::PhysicsAdaptor;
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_PhysicsAdaptor__SWIG_0()
-  {
-    void*        jresult;
-    PhysicsAdaptor* result = 0;
-
-    {
-      try
-      {
-        result = (PhysicsAdaptor*)new PhysicsAdaptor();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void*)result;
-    return jresult;
-  }
 
   SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsAdaptor_New(void* csMatrix, void* csSize)
   {
@@ -82,25 +66,6 @@ extern "C" {
     return jresult;
   }
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsAdaptor_DownCast(void* csHandle)
-  {
-    Dali::BaseHandle* handle = (Dali::BaseHandle*)csHandle;
-    PhysicsAdaptor result;
-
-    if(!handle)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = PhysicsAdaptor::DownCast(*handle);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-    return new PhysicsAdaptor((const PhysicsAdaptor&)result);
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PhysicsAdaptor(void* csPhysicsAdaptor)
   {
diff --git a/dali-csharp-binder/dali-physics-3d/physics-actor-3d-wrap.cpp b/dali-csharp-binder/dali-physics-3d/physics-actor-3d-wrap.cpp
index a197dce2..6997e59e 100644
--- a/dali-csharp-binder/dali-physics-3d/physics-actor-3d-wrap.cpp
+++ b/dali-csharp-binder/dali-physics-3d/physics-actor-3d-wrap.cpp
@@ -29,22 +29,6 @@ extern "C" {
   using Dali::Toolkit::Physics::PhysicsActor;
   using Dali::Toolkit::Physics::PhysicsAdaptor;
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_PhysicsActor__SWIG_0()
-  {
-    void*        jresult;
-    PhysicsActor* result = 0;
-
-    {
-      try
-      {
-        result = (PhysicsActor*)new PhysicsActor();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void*)result;
-    return jresult;
-  }
 
   SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsActor_New(void* csActor, void* csBody, void* csAdaptor)
   {
@@ -79,25 +63,6 @@ extern "C" {
     return new PhysicsActor((const PhysicsActor&)result);
   }
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsActor_DownCast(void* csHandle)
-  {
-    Dali::BaseHandle* handle = (Dali::BaseHandle*)csHandle;
-    PhysicsActor result;
-
-    if(!handle)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = PhysicsActor::DownCast(*handle);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-    return new PhysicsActor((const PhysicsActor&)result);
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PhysicsActor(void* csPhysicsActor)
   {
diff --git a/dali-csharp-binder/dali-physics-3d/physics-adaptor-3d-wrap.cpp b/dali-csharp-binder/dali-physics-3d/physics-adaptor-3d-wrap.cpp
index b9efa85f..6550d4f0 100644
--- a/dali-csharp-binder/dali-physics-3d/physics-adaptor-3d-wrap.cpp
+++ b/dali-csharp-binder/dali-physics-3d/physics-adaptor-3d-wrap.cpp
@@ -32,22 +32,6 @@ extern "C" {
   using Dali::Toolkit::Physics::PhysicsActor;
   using Dali::Toolkit::Physics::PhysicsAdaptor;
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_PhysicsAdaptor__SWIG_0()
-  {
-    void*        jresult;
-    PhysicsAdaptor* result = 0;
-
-    {
-      try
-      {
-        result = (PhysicsAdaptor*)new PhysicsAdaptor();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void*)result;
-    return jresult;
-  }
 
   SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsAdaptor_New(void* csMatrix, void* csSize)
   {
@@ -82,25 +66,6 @@ extern "C" {
     return jresult;
   }
 
-  SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_PhysicsAdaptor_DownCast(void* csHandle)
-  {
-    Dali::BaseHandle* handle = (Dali::BaseHandle*)csHandle;
-    PhysicsAdaptor result;
-
-    if(!handle)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = PhysicsAdaptor::DownCast(*handle);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-    return new PhysicsAdaptor((const PhysicsAdaptor&)result);
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PhysicsAdaptor(void* csPhysicsAdaptor)
   {
diff --git a/dali-csharp-binder/dali-scene3d/light-wrap.cpp b/dali-csharp-binder/dali-scene3d/light-wrap.cpp
index f471db75..c6ceb647 100644
--- a/dali-csharp-binder/dali-scene3d/light-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/light-wrap.cpp
@@ -40,20 +40,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Light_New_SWIG_0()
   return new Dali::Scene3D::Light((const Dali::Scene3D::Light&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Light_SWIG_0()
-{
-  Dali::Scene3D::Light* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::Light*)new Dali::Scene3D::Light();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Light_SWIG_1(void* csLight)
 {
@@ -76,60 +62,8 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Light_SWIG_1(void* csLight)
   return (void*)result;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Light(void* csLight)
-{
-  Dali::Scene3D::Light* light = (Dali::Scene3D::Light*)csLight;
-  {
-    try
-    {
-      delete light;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Light_Assign(void* csDestination, void* csSource)
-{
-  Dali::Scene3D::Light* destination = (Dali::Scene3D::Light*)csDestination;
-  Dali::Scene3D::Light* source      = (Dali::Scene3D::Light*)csSource;
-  Dali::Scene3D::Light* result      = 0;
 
-  if(!source)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Scene3D::Light const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (Dali::Scene3D::Light*)&(destination)->operator=((Dali::Scene3D::Light const&)*source);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Light_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*    handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::Light result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Light", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::Light::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::Light((const Dali::Scene3D::Light&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Light_Enable(void* csLight, bool enable)
 {
diff --git a/dali-csharp-binder/dali-scene3d/material-wrap.cpp b/dali-csharp-binder/dali-scene3d/material-wrap.cpp
index 2bc8d6f6..40cbae46 100644
--- a/dali-csharp-binder/dali-scene3d/material-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/material-wrap.cpp
@@ -42,20 +42,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Material_New_SWIG_0()
   return new Dali::Scene3D::Material((const Dali::Scene3D::Material&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Material_SWIG_0()
-{
-  Dali::Scene3D::Material* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::Material*)new Dali::Scene3D::Material();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Material_SWIG_1(void* csModel)
 {
@@ -112,26 +98,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Material_Assign(void* csDestination, vo
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Material_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*       handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::Material result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Material", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::Material::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::Material((const Dali::Scene3D::Material&)result);
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Material_property_NAME_get()
 {
diff --git a/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
index c86ab998..fcc347b0 100644
--- a/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
@@ -41,20 +41,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Node_New_SWIG_0()
   return new Dali::Scene3D::ModelNode((const Dali::Scene3D::ModelNode&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_Node_SWIG_0()
-{
-  Dali::Scene3D::ModelNode* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::ModelNode*)new Dali::Scene3D::ModelNode();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_Node_SWIG_1(void* csModel)
 {
@@ -111,26 +97,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Node_Assign(void* csDestination,
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Node_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*    handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::ModelNode result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::ModelNode", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::ModelNode::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::ModelNode((const Dali::Scene3D::ModelNode&)result);
-}
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Model_Node_GetModelPrimitiveCount(void* csModelNode)
 {
diff --git a/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
index 34518cd7..06dd4b97 100644
--- a/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
@@ -40,20 +40,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Primitive_New_SWIG_0()
   return new Dali::Scene3D::ModelPrimitive((const Dali::Scene3D::ModelPrimitive&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_Primitive_SWIG_0()
-{
-  Dali::Scene3D::ModelPrimitive* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::ModelPrimitive*)new Dali::Scene3D::ModelPrimitive();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_Primitive_SWIG_1(void* csModel)
 {
@@ -110,26 +96,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Primitive_Assign(void* csDestinat
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Primitive_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*    handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::ModelPrimitive result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::ModelPrimitive", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::ModelPrimitive::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::ModelPrimitive((const Dali::Scene3D::ModelPrimitive&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Model_Primitive_SetGeometry(void* csModelPrimitive, void* csGeometry)
 {
diff --git a/dali-csharp-binder/dali-scene3d/model-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-wrap.cpp
index cfa56ea9..892ec833 100644
--- a/dali-csharp-binder/dali-scene3d/model-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/model-wrap.cpp
@@ -73,20 +73,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_New_SWIG_1()
   return new Dali::Scene3D::Model((const Dali::Scene3D::Model&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_SWIG_0()
-{
-  Dali::Scene3D::Model* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::Model*)new Dali::Scene3D::Model();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Model_SWIG_1(void* csModel)
 {
@@ -143,26 +129,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Assign(void* csDestination, void*
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*    handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::Model result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::Model::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::Model((const Dali::Scene3D::Model&)result);
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_GetModelRoot(void* csModel)
 {
@@ -221,43 +187,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Model_RemoveModelNode(void* csModel, voi
   CALL_CATCH_EXCEPTION();
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Model_SetChildrenSensitive(void* csModel, bool enable)
-{
-  Dali::Scene3D::Model* model = (Dali::Scene3D::Model*)csModel;
 
-  if(!model)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return;
-  }
-  {
-    try
-    {
-      model->SetChildrenSensitive(enable);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Model_GetChildrenSensitive(void* csModel)
-{
-  Dali::Scene3D::Model* model = (Dali::Scene3D::Model*)csModel;
-  bool                  result;
-
-  if(!model)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return false;
-  }
-  {
-    try
-    {
-      result = model->GetChildrenSensitive();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-  return result;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Model_SetImageBasedLightSource(void* csModel, char* csDiffuseUrl, char* csSpecularUrl, float scaleFactor)
 {
diff --git a/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp b/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp
index 50a9ff69..51aca0ad 100644
--- a/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp
@@ -57,20 +57,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionData_New_SWIG_1(float durationSec
   return new Dali::Scene3D::MotionData((const Dali::Scene3D::MotionData&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionData_SWIG_0()
-{
-  Dali::Scene3D::MotionData* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::MotionData*)new Dali::Scene3D::MotionData();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionData_SWIG_1(void* csMotionData)
 {
@@ -127,26 +113,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionData_Assign(void* csDestination,
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionData_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*         handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::MotionData result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::MotionData::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::MotionData((const Dali::Scene3D::MotionData&)result);
-}
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_MotionData_GetMotionCount(void* csMotionData)
 {
diff --git a/dali-csharp-binder/dali-scene3d/motion-index-wrap.cpp b/dali-csharp-binder/dali-scene3d/motion-index-wrap.cpp
index b52dd8a2..a4f7a59b 100644
--- a/dali-csharp-binder/dali-scene3d/motion-index-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/motion-index-wrap.cpp
@@ -30,20 +30,6 @@ extern "C" {
 
 // MotionIndex
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionIndex_SWIG_0()
-{
-  Dali::Scene3D::MotionIndex* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::MotionIndex*)new Dali::Scene3D::MotionIndex();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionIndex_SWIG_1(void* csMotionIndex)
 {
@@ -100,26 +86,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionIndex_Assign(void* csDestination,
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionIndex_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*          handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::MotionIndex result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::MotionIndex::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::MotionIndex((const Dali::Scene3D::MotionIndex&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionIndex_SetModelNodeId(void* csMotionIndex, void* csPropertyKey)
 {
@@ -231,20 +197,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_BlendShapeIndex_New_SWIG_2(void* csMode
   return new Dali::Scene3D::BlendShapeIndex((const Dali::Scene3D::BlendShapeIndex&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_BlendShapeIndex_SWIG_0()
-{
-  Dali::Scene3D::BlendShapeIndex* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::BlendShapeIndex*)new Dali::Scene3D::BlendShapeIndex();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_BlendShapeIndex_SWIG_1(void* csBlendShapeIndex)
 {
@@ -301,26 +253,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_BlendShapeIndex_Assign(void* csDestinat
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_BlendShapeIndex_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*              handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::BlendShapeIndex result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::BlendShapeIndex::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::BlendShapeIndex((const Dali::Scene3D::BlendShapeIndex&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BlendShapeIndex_SetBlendShapeId(void* csBlendShapeIndex, void* csBlendShapePropertyKey)
 {
@@ -411,20 +343,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionPropertyIndex_New_SWIG_1(void* cs
   return new Dali::Scene3D::MotionPropertyIndex((const Dali::Scene3D::MotionPropertyIndex&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionPropertyIndex_SWIG_0()
-{
-  Dali::Scene3D::MotionPropertyIndex* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::MotionPropertyIndex*)new Dali::Scene3D::MotionPropertyIndex();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionPropertyIndex_SWIG_1(void* csMotionPropertyIndex)
 {
@@ -481,26 +399,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionPropertyIndex_Assign(void* csDest
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionPropertyIndex_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*                  handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::MotionPropertyIndex result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::MotionPropertyIndex::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::MotionPropertyIndex((const Dali::Scene3D::MotionPropertyIndex&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionPropertyIndex_SetPropertyId(void* csMotionPropertyIndex, void* csPropertyKey)
 {
@@ -585,20 +483,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionTransformIndex_New_SWIG_1(void* c
   return new Dali::Scene3D::MotionTransformIndex((const Dali::Scene3D::MotionTransformIndex&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionTransformIndex_SWIG_0()
-{
-  Dali::Scene3D::MotionTransformIndex* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::MotionTransformIndex*)new Dali::Scene3D::MotionTransformIndex();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionTransformIndex_SWIG_1(void* csMotionTransformIndex)
 {
@@ -655,26 +539,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionTransformIndex_Assign(void* csDes
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionTransformIndex_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*                   handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::MotionTransformIndex result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::MotionTransformIndex::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::MotionTransformIndex((const Dali::Scene3D::MotionTransformIndex&)result);
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionTransformIndex_SetTransformType(void* csMotionTransformIndex, int csTransformType)
 {
diff --git a/dali-csharp-binder/dali-scene3d/motion-value-wrap.cpp b/dali-csharp-binder/dali-scene3d/motion-value-wrap.cpp
index 160a6a70..ac4e8a0e 100644
--- a/dali-csharp-binder/dali-scene3d/motion-value-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/motion-value-wrap.cpp
@@ -84,20 +84,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionValue_New_SWIG_2(void* csKeyFrame
   return new Dali::Scene3D::MotionValue((const Dali::Scene3D::MotionValue&)result);
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionValue_SWIG_0()
-{
-  Dali::Scene3D::MotionValue* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Scene3D::MotionValue*)new Dali::Scene3D::MotionValue();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return (void*)result;
-}
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_MotionValue_SWIG_1(void* csMotionValue)
 {
@@ -154,26 +140,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionValue_Assign(void* csDestination,
   return (void*)result;
 }
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_MotionValue_DownCast(void* csHandle)
-{
-  Dali::BaseHandle*          handle = (Dali::BaseHandle*)csHandle;
-  Dali::Scene3D::MotionValue result;
-
-  if(!handle)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::Model", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = Dali::Scene3D::MotionValue::DownCast(*handle);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return new Dali::Scene3D::MotionValue((const Dali::Scene3D::MotionValue&)result);
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MotionValue_GetValueType(void* csMotionValue)
 {
diff --git a/dali-csharp-binder/dali-scene3d/scene-view-wrap.cpp b/dali-csharp-binder/dali-scene3d/scene-view-wrap.cpp
index 1417ea83..b1a00807 100755
--- a/dali-csharp-binder/dali-scene3d/scene-view-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/scene-view-wrap.cpp
@@ -39,21 +39,6 @@ extern "C"
     return new Dali::Scene3D::SceneView((const Dali::Scene3D::SceneView &)result);
   }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_SceneView_SWIG_0()
-  {
-    Dali::Scene3D::SceneView *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Scene3D::SceneView *)new Dali::Scene3D::SceneView();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    return (void *)result;
-  }
-
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_SceneView_SWIG_1(void *csSceneView)
   {
     Dali::Scene3D::SceneView *sceneView = (Dali::Scene3D::SceneView *)csSceneView;
@@ -109,27 +94,6 @@ extern "C"
     return (void *)result;
   }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_SceneView_DownCast(void *csHandle)
-  {
-    Dali::BaseHandle *handle = (Dali::BaseHandle *)csHandle;
-    Dali::Scene3D::SceneView result;
-
-    if (!handle)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::SceneView", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = Dali::Scene3D::SceneView::DownCast(*handle);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    return new Dali::Scene3D::SceneView((const Dali::Scene3D::SceneView &)result);
-  }
-
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SceneView_AddCamera(void *csSceneView, void *csCamera)
   {
     Dali::Scene3D::SceneView *sceneView = (Dali::Scene3D::SceneView *)csSceneView;
diff --git a/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp b/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
index 53fcab31..ecaf8f30 100644
--- a/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
@@ -492,12 +492,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Accessibility_new_Range(
   return (void*)result;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_delete_Range(void* arg1_range)
-{
-  try_catch(([&]() {
-    delete static_cast<Dali::Accessibility::Range*>(arg1_range);
-  }));
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_Bridge_RegisterDefaultLabel(void* arg1_actor)
 {
diff --git a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
index 2f2e7800..81326156 100644
--- a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
@@ -1696,32 +1696,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_ALIGN_CONTENT_get(
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer_Property() {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::FlexContainer::Property *)new Dali::Toolkit::FlexContainer::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer_Property(void * jarg1) {
-  Dali::Toolkit::FlexContainer::Property *arg1 = (Dali::Toolkit::FlexContainer::Property *) 0 ;
 
-  arg1 = (Dali::Toolkit::FlexContainer::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_ChildProperty_FLEX_get() {
@@ -1802,94 +1778,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ImageView_Property_TRANSITION_EFFECT_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_SCROLL_DIRECTION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::ScrollBar::Property::SCROLL_DIRECTION;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_HEIGHT_POLICY;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_FIXED_HEIGHT;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_SHOW_DURATION_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_SHOW_DURATION;
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_HIDE_DURATION_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_HIDE_DURATION;
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_SCROLL_POSITION_INTERVALS_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS;
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_MINIMUM_HEIGHT;
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_START_PADDING_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_START_PADDING;
-  jresult = (int)result;
-  return jresult;
-}
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_END_PADDING_get() {
-  int jresult ;
-  int result;
 
-  result = (int)Dali::Toolkit::ScrollBar::Property::INDICATOR_END_PADDING;
-  jresult = (int)result;
-  return jresult;
-}
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get() {
@@ -2501,14 +2405,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_CELL_VERTICAL_ALI
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_DEFAULT_RENDERING_BACKEND_get() {
-  unsigned int jresult ;
-  unsigned int result;
-
-  result = (unsigned int)(unsigned int)Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND;
-  jresult = result;
-  return jresult;
-}
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_TEXT_get() {
@@ -2823,19 +2719,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Range_FOREGROUND_EFFECT_get() {
 // Method
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Builder() {
-  void * jresult ;
-  Dali::Toolkit::Builder *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Builder *)new Dali::Toolkit::Builder();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_New() {
@@ -3468,19 +3351,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_QuitSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::TransitionData *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TransitionData *)new Dali::Toolkit::TransitionData();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TransitionData(void * jarg1) {
   Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
@@ -3537,27 +3407,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_New__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::TransitionData result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::TransitionData::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TransitionData((const Dali::Toolkit::TransitionData &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_1(void * jarg1) {
@@ -3581,27 +3430,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
-  Dali::Toolkit::TransitionData *arg2 = 0 ;
-  Dali::Toolkit::TransitionData *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TransitionData *)jarg1;
-  arg2 = (Dali::Toolkit::TransitionData *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TransitionData const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TransitionData *) &(arg1)->operator =((Dali::Toolkit::TransitionData const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TransitionData_Count(void * jarg1) {
@@ -4634,60 +4462,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetImplementation__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View_Property() {
-  void * jresult ;
-  Dali::Toolkit::Control::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Control::Property *)new Dali::Toolkit::Control::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View_Property(void * jarg1) {
-  Dali::Toolkit::Control::Property *arg1 = (Dali::Toolkit::Control::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::Control::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View_KeyboardFocus() {
-  void * jresult ;
-  Dali::Toolkit::Control::KeyboardFocus *result = 0 ;
 
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyboardFocus *)new Dali::Toolkit::Control::KeyboardFocus();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View_KeyboardFocus(void * jarg1) {
-  Dali::Toolkit::Control::KeyboardFocus *arg1 = (Dali::Toolkit::Control::KeyboardFocus *) 0 ;
 
-  arg1 = (Dali::Toolkit::Control::KeyboardFocus *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_New() {
@@ -4718,40 +4498,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_NewCustom() {
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::Control *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Control *)new Dali::Toolkit::Control();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = 0 ;
-  Dali::Toolkit::Control *result = 0 ;
 
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Control *)new Dali::Toolkit::Control((Dali::Toolkit::Control const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View(void * jarg1) {
@@ -4767,27 +4515,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
-  Dali::Toolkit::Control *arg2 = 0 ;
-  Dali::Toolkit::Control *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  arg2 = (Dali::Toolkit::Control *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Control *) &(arg1)->operator =((Dali::Toolkit::Control const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_DownCast(void * jarg1) {
@@ -4812,12 +4539,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_DownCast(void * jarg1) {
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Control(void * jarg1) {
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) jarg1;
-  try {
-    delete arg1;
-  } CALL_CATCH_EXCEPTION();
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetKeyInputFocus(void * jarg1) {
@@ -4971,23 +4692,6 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_View_GetStyleName(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetBackgroundColor(void * jarg1, void * jarg2) {
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
-  Dali::Vector4 *arg2 = 0 ;
-
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  arg2 = (Dali::Vector4 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetBackgroundColor((Dali::Vector4 const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_ClearBackground(void * jarg1) {
@@ -5397,19 +5101,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Alignment_Padding(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Alignment__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::Alignment *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Alignment *)new Dali::Toolkit::Alignment();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_New__SWIG_0(int jarg1, int jarg2) {
@@ -5497,27 +5188,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Alignment(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::Alignment result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::Alignment::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Alignment((const Dali::Toolkit::Alignment &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_SetAlignmentType(void * jarg1, int jarg2) {
@@ -5687,921 +5357,122 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceReadySignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyEventSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
-  Dali::Toolkit::Control::KeyEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Internal::Control *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyEventSignalType *) &(arg1)->KeyEventSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyInputFocusGainedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
-  Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Internal::Control *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyInputFocusSignalType *) &(arg1)->KeyInputFocusGainedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::FlexContainer *)new Dali::Toolkit::FlexContainer();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer *arg1 = 0 ;
-  Dali::Toolkit::FlexContainer *result = 0 ;
-
-  arg1 = (Dali::Toolkit::FlexContainer *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::FlexContainer const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::FlexContainer *)new Dali::Toolkit::FlexContainer((Dali::Toolkit::FlexContainer const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer *arg1 = (Dali::Toolkit::FlexContainer *) 0 ;
-  Dali::Toolkit::FlexContainer *arg2 = 0 ;
-  Dali::Toolkit::FlexContainer *result = 0 ;
-
-  arg1 = (Dali::Toolkit::FlexContainer *)jarg1;
-  arg2 = (Dali::Toolkit::FlexContainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::FlexContainer const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::FlexContainer *) &(arg1)->operator =((Dali::Toolkit::FlexContainer const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer(void * jarg1) {
-  Dali::Toolkit::FlexContainer *arg1 = (Dali::Toolkit::FlexContainer *) 0 ;
-
-  arg1 = (Dali::Toolkit::FlexContainer *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_New() {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer result;
-
-  {
-    try {
-      result = Dali::Toolkit::FlexContainer::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::FlexContainer((const Dali::Toolkit::FlexContainer &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::FlexContainer result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::FlexContainer::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::FlexContainer((const Dali::Toolkit::FlexContainer &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer_ChildProperty() {
-  void * jresult ;
-  Dali::Toolkit::FlexContainer::ChildProperty *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::FlexContainer::ChildProperty *)new Dali::Toolkit::FlexContainer::ChildProperty();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer_ChildProperty(void * jarg1) {
-  Dali::Toolkit::FlexContainer::ChildProperty *arg1 = (Dali::Toolkit::FlexContainer::ChildProperty *) 0 ;
-
-  arg1 = (Dali::Toolkit::FlexContainer::ChildProperty *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView_Property() {
-  void * jresult ;
-  Dali::Toolkit::ImageView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ImageView::Property *)new Dali::Toolkit::ImageView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView_Property(void * jarg1) {
-  Dali::Toolkit::ImageView::Property *arg1 = (Dali::Toolkit::ImageView::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::ImageView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ImageView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ImageView *)new Dali::Toolkit::ImageView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ImageView result;
-
-  {
-    try {
-      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_2(char * jarg1) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::Toolkit::ImageView result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  {
-    try {
-      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, (std::string const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_3(char * jarg1, void * jarg2) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::ImageDimensions arg2 ;
-  Dali::ImageDimensions *argp2 ;
-  Dali::Toolkit::ImageView result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  argp2 = (Dali::ImageDimensions *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, (std::string const &)*arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView(void * jarg1) {
-  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
-
-  arg1 = (Dali::Toolkit::ImageView *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ImageView *arg1 = 0 ;
-  Dali::Toolkit::ImageView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ImageView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ImageView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ImageView *)new Dali::Toolkit::ImageView((Dali::Toolkit::ImageView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
-  Dali::Toolkit::ImageView *arg2 = 0 ;
-  Dali::Toolkit::ImageView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ImageView *)jarg1;
-  arg2 = (Dali::Toolkit::ImageView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ImageView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ImageView *) &(arg1)->operator =((Dali::Toolkit::ImageView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ImageView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ImageView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_1(void * jarg1, char * jarg2) {
-  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
-  std::string *arg2 = 0 ;
-
-  arg1 = (Dali::Toolkit::ImageView *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  {
-    try {
-      (arg1)->SetImage((std::string const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-
-  //argout typemap for const std::string&
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
-  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::ImageDimensions arg3 ;
-  Dali::ImageDimensions *argp3 ;
-
-  arg1 = (Dali::Toolkit::ImageView *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return ;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  argp3 = (Dali::ImageDimensions *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
-    return ;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      (arg1)->SetImage((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-
-  //argout typemap for const std::string&
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar_Property() {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar::Property *)new Dali::Toolkit::ScrollBar::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollBar_Property(void * jarg1) {
-  Dali::Toolkit::ScrollBar::Property *arg1 = (Dali::Toolkit::ScrollBar::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar *)new Dali::Toolkit::ScrollBar();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = 0 ;
-  Dali::Toolkit::ScrollBar *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ScrollBar const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar *)new Dali::Toolkit::ScrollBar((Dali::Toolkit::ScrollBar const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar *arg2 = 0 ;
-  Dali::Toolkit::ScrollBar *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (Dali::Toolkit::ScrollBar *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ScrollBar const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar *) &(arg1)->operator =((Dali::Toolkit::ScrollBar const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollBar(void * jarg1) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_New__SWIG_0(int jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar::Direction arg1 ;
-  Dali::Toolkit::ScrollBar result;
-
-  arg1 = (Dali::Toolkit::ScrollBar::Direction)jarg1;
-  {
-    try {
-      result = Dali::Toolkit::ScrollBar::New(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ScrollBar((const Dali::Toolkit::ScrollBar &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_New__SWIG_1() {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar result;
-
-  {
-    try {
-      result = Dali::Toolkit::ScrollBar::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ScrollBar((const Dali::Toolkit::ScrollBar &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ScrollBar result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ScrollBar::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ScrollBar((const Dali::Toolkit::ScrollBar &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollPropertySource(void * jarg1, void * jarg2, int jarg3, int jarg4, int jarg5, int jarg6) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Handle arg2 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Index arg4 ;
-  Dali::Property::Index arg5 ;
-  Dali::Property::Index arg6 ;
-  Dali::Handle *argp2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  argp2 = (Dali::Handle *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Handle", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::Property::Index)jarg3;
-  arg4 = (Dali::Property::Index)jarg4;
-  arg5 = (Dali::Property::Index)jarg5;
-  arg6 = (Dali::Property::Index)jarg6;
-  {
-    try {
-      (arg1)->SetScrollPropertySource(arg2,arg3,arg4,arg5,arg6);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollIndicator(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetScrollIndicator(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollIndicator(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Actor result;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      result = (arg1)->GetScrollIndicator();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Actor((const Dali::Actor &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollPositionIntervals(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *arg2 = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->SetScrollPositionIntervals((Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollPositionIntervals(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      jresult = new Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true >((const Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > &)(((Dali::Toolkit::ScrollBar const *)arg1)->GetScrollPositionIntervals()));
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollDirection(void * jarg1, int jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::Direction arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (Dali::Toolkit::ScrollBar::Direction)jarg2;
-  {
-    try {
-      (arg1)->SetScrollDirection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollDirection(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::Direction result;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar::Direction)((Dali::Toolkit::ScrollBar const *)arg1)->GetScrollDirection();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorHeightPolicy(void * jarg1, int jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::IndicatorHeightPolicy arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (Dali::Toolkit::ScrollBar::IndicatorHeightPolicy)jarg2;
-  {
-    try {
-      (arg1)->SetIndicatorHeightPolicy(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorHeightPolicy(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::IndicatorHeightPolicy result;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::ScrollBar::IndicatorHeightPolicy)((Dali::Toolkit::ScrollBar const *)arg1)->GetIndicatorHeightPolicy();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorFixedHeight(void * jarg1, float jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetIndicatorFixedHeight(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorFixedHeight(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ScrollBar const *)arg1)->GetIndicatorFixedHeight();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorShowDuration(void * jarg1, float jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetIndicatorShowDuration(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorShowDuration(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ScrollBar const *)arg1)->GetIndicatorShowDuration();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorHideDuration(void * jarg1, float jarg2) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetIndicatorHideDuration(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorHideDuration(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  float result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer(void * jarg1) {
+  Dali::Toolkit::FlexContainer *arg1 = (Dali::Toolkit::FlexContainer *) 0 ;
 
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
+  arg1 = (Dali::Toolkit::FlexContainer *)jarg1;
   {
     try {
-      result = (float)((Dali::Toolkit::ScrollBar const *)arg1)->GetIndicatorHideDuration();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_ShowIndicator(void * jarg1) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_New() {
+  void * jresult ;
+  Dali::Toolkit::FlexContainer result;
 
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
   {
     try {
-      (arg1)->ShowIndicator();
-    } CALL_CATCH_EXCEPTION();
+      result = Dali::Toolkit::FlexContainer::New();
+    } CALL_CATCH_EXCEPTION(0);
   }
 
+  jresult = new Dali::Toolkit::FlexContainer((const Dali::Toolkit::FlexContainer &)result);
+  return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView_Property(void * jarg1) {
+  Dali::Toolkit::ImageView::Property *arg1 = (Dali::Toolkit::ImageView::Property *) 0 ;
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_HideIndicator(void * jarg1) {
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
+  arg1 = (Dali::Toolkit::ImageView::Property *)jarg1;
   {
     try {
-      (arg1)->HideIndicator();
+      delete arg1;
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_PanFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_0() {
   void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::PanFinishedSignalType *result = 0 ;
+  Dali::Toolkit::ImageView result;
 
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
   {
     try {
-      result = (Dali::Toolkit::ScrollBar::PanFinishedSignalType *) &(arg1)->PanFinishedSignal();
+      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_ScrollPositionIntervalReachedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_2(char * jarg1) {
   void * jresult ;
-  Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
-  Dali::Toolkit::ScrollBar::ScrollPositionIntervalReachedSignalType *result = 0 ;
+  std::string *arg1 = 0 ;
+  Dali::Toolkit::ImageView result;
 
-  arg1 = (Dali::Toolkit::ScrollBar *)jarg1;
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
   {
     try {
-      result = (Dali::Toolkit::ScrollBar::ScrollPositionIntervalReachedSignalType *) &(arg1)->ScrollPositionIntervalReachedSignal();
+      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, (std::string const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_3(char * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::Scrollable::Property *result = 0 ;
+  std::string *arg1 = 0 ;
+  Dali::ImageDimensions arg2 ;
+  Dali::ImageDimensions *argp2 ;
+  Dali::Toolkit::ImageView result;
 
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str;
+  argp2 = (Dali::ImageDimensions *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
+    return 0;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::Toolkit::Scrollable::Property *)new Dali::Toolkit::Scrollable::Property();
+      result = Dali::Toolkit::ImageView::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, (std::string const &)*arg1,arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
+
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Scrollable_Property(void * jarg1) {
-  Dali::Toolkit::Scrollable::Property *arg1 = (Dali::Toolkit::Scrollable::Property *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView(void * jarg1) {
+  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
 
-  arg1 = (Dali::Toolkit::Scrollable::Property *)jarg1;
+  arg1 = (Dali::Toolkit::ImageView *)jarg1;
   {
     try {
       delete arg1;
@@ -6611,57 +5482,66 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Scrollable_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::Scrollable *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_1(void * jarg1, char * jarg2) {
+  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
+  std::string *arg2 = 0 ;
 
+  arg1 = (Dali::Toolkit::ImageView *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
   {
     try {
-      result = (Dali::Toolkit::Scrollable *)new Dali::Toolkit::Scrollable();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetImage((std::string const &)*arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
+
+  //argout typemap for const std::string&
+
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Scrollable *arg1 = 0 ;
-  Dali::Toolkit::Scrollable *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
+  Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
+  std::string *arg2 = 0 ;
+  Dali::ImageDimensions arg3 ;
+  Dali::ImageDimensions *argp3 ;
 
-  arg1 = (Dali::Toolkit::Scrollable *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Scrollable const & type is null", 0);
-    return 0;
+  arg1 = (Dali::Toolkit::ImageView *)jarg1;
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
   }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str;
+  argp3 = (Dali::ImageDimensions *)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
+    return ;
+  }
+  arg3 = *argp3;
   {
     try {
-      result = (Dali::Toolkit::Scrollable *)new Dali::Toolkit::Scrollable((Dali::Toolkit::Scrollable const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetImage((std::string const &)*arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
+  //argout typemap for const std::string&
+
+}
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable__SWIG_0() {
   void * jresult ;
-  Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
-  Dali::Toolkit::Scrollable *arg2 = 0 ;
   Dali::Toolkit::Scrollable *result = 0 ;
 
-  arg1 = (Dali::Toolkit::Scrollable *)jarg1;
-  arg2 = (Dali::Toolkit::Scrollable *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Scrollable const & type is null", 0);
-    return 0;
-  }
   {
     try {
-      result = (Dali::Toolkit::Scrollable *) &(arg1)->operator =((Dali::Toolkit::Scrollable const &)*arg2);
+      result = (Dali::Toolkit::Scrollable *)new Dali::Toolkit::Scrollable();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -6683,29 +5563,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Scrollable(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::Scrollable result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::Scrollable::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Scrollable((const Dali::Toolkit::Scrollable &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Scrollable_IsOvershootEnabled(void * jarg1) {
   bool jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
@@ -6857,38 +5714,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_ScrollCompletedSignal(void
 }
 
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsVertical(int jarg1) {
-  bool jresult ;
-  Dali::Toolkit::ControlOrientation::Type arg1 ;
-  bool result;
-
-  arg1 = (Dali::Toolkit::ControlOrientation::Type)jarg1;
-  {
-    try {
-      result = (bool)Dali::Toolkit::IsVertical(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsHorizontal(int jarg1) {
-  bool jresult ;
-  Dali::Toolkit::ControlOrientation::Type arg1 ;
-  bool result;
 
-  arg1 = (Dali::Toolkit::ControlOrientation::Type)jarg1;
-  {
-    try {
-      result = (bool)Dali::Toolkit::IsHorizontal(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemRange__SWIG_0(unsigned int jarg1, unsigned int jarg2) {
@@ -7066,36 +5893,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemLayout(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_SetOrientation(void * jarg1, int jarg2) {
-  Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
-  Dali::Toolkit::ControlOrientation::Type arg2 ;
-
-  arg1 = (Dali::Toolkit::ItemLayout *)jarg1;
-  arg2 = (Dali::Toolkit::ControlOrientation::Type)jarg2;
-  {
-    try {
-      (arg1)->SetOrientation(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemLayout_GetOrientation(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
-  Dali::Toolkit::ControlOrientation::Type result;
 
-  arg1 = (Dali::Toolkit::ItemLayout *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::ControlOrientation::Type)((Dali::Toolkit::ItemLayout const *)arg1)->GetOrientation();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (int)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_SetLayoutProperties(void * jarg1, void * jarg2) {
@@ -7627,96 +6426,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_ItemReleasedSwigExplicitItem
   {
     try {
       (arg1)->Dali::Toolkit::ItemFactory::ItemReleased(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView_Property() {
-  void * jresult ;
-  Dali::Toolkit::ItemView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ItemView::Property *)new Dali::Toolkit::ItemView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemView_Property(void * jarg1) {
-  Dali::Toolkit::ItemView::Property *arg1 = (Dali::Toolkit::ItemView::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::ItemView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ItemView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ItemView *)new Dali::Toolkit::ItemView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ItemView *arg1 = 0 ;
-  Dali::Toolkit::ItemView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ItemView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ItemView *)new Dali::Toolkit::ItemView((Dali::Toolkit::ItemView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  Dali::Toolkit::ItemView *arg2 = 0 ;
-  Dali::Toolkit::ItemView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  arg2 = (Dali::Toolkit::ItemView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ItemView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ItemView *) &(arg1)->operator =((Dali::Toolkit::ItemView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
@@ -7754,29 +6466,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_New(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ItemView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ItemView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ItemView((const Dali::Toolkit::ItemView &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemView_GetLayoutCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
@@ -7921,102 +6610,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_DeactivateCurrentLayout(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetMinimumSwipeSpeed(void * jarg1, float jarg2) {
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetMinimumSwipeSpeed(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetMinimumSwipeSpeed(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ItemView const *)arg1)->GetMinimumSwipeSpeed();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetMinimumSwipeDistance(void * jarg1, float jarg2) {
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetMinimumSwipeDistance(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetMinimumSwipeDistance(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ItemView const *)arg1)->GetMinimumSwipeDistance();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetWheelScrollDistanceStep(void * jarg1, float jarg2) {
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetWheelScrollDistanceStep(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetWheelScrollDistanceStep(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ItemView const *)arg1)->GetWheelScrollDistanceStep();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetAnchoring(void * jarg1, bool jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   bool arg2 ;
@@ -8098,38 +6691,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_ScrollToItem(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetRefreshInterval(void * jarg1, float jarg2) {
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      (arg1)->SetRefreshInterval(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetRefreshInterval(void * jarg1) {
-  float jresult ;
-  Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
-  float result;
-
-  arg1 = (Dali::Toolkit::ItemView *)jarg1;
-  {
-    try {
-      result = (float)((Dali::Toolkit::ItemView const *)arg1)->GetRefreshInterval();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_Refresh(void * jarg1) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
 
@@ -8421,50 +6982,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_LayoutActivatedSignal(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MoveActorConstraint(void * jarg1, void * jarg2) {
-  Dali::Vector3 *arg1 = 0 ;
-  PropertyInputContainer *arg2 = 0 ;
-
-  arg1 = (Dali::Vector3 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
-  arg2 = (PropertyInputContainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "PropertyInputContainer const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      Dali::Toolkit::MoveActorConstraint(*arg1,(PropertyInputContainer const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WrapActorConstraint(void * jarg1, void * jarg2) {
-  Dali::Vector3 *arg1 = 0 ;
-  PropertyInputContainer *arg2 = 0 ;
 
-  arg1 = (Dali::Vector3 *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 & type is null", 0);
-    return ;
-  }
-  arg2 = (PropertyInputContainer *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "PropertyInputContainer const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      Dali::Toolkit::WrapActorConstraint(*arg1,(PropertyInputContainer const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollViewEffect() {
@@ -8529,148 +7048,38 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_New(void * ja
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Toolkit::ScrollViewPagePathEffect((const Dali::Toolkit::ScrollViewPagePathEffect &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollViewPagePathEffect() {
-  void * jresult ;
-  Dali::Toolkit::ScrollViewPagePathEffect *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollViewPagePathEffect *)new Dali::Toolkit::ScrollViewPagePathEffect();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ScrollViewPagePathEffect result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ScrollViewPagePathEffect::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ScrollViewPagePathEffect((const Dali::Toolkit::ScrollViewPagePathEffect &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_ApplyToPage(void * jarg1, void * jarg2, unsigned int jarg3) {
-  Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
-  Dali::Actor arg2 ;
-  unsigned int arg3 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  arg3 = (unsigned int)jarg3;
-  {
-    try {
-      (arg1)->ApplyToPage(arg2,arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollViewPagePathEffect(void * jarg1) {
-  Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ClampState2D_x_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
-  Dali::Toolkit::ClampState arg2 ;
-
-  arg1 = (Dali::Toolkit::ClampState2D *)jarg1;
-  arg2 = (Dali::Toolkit::ClampState)jarg2;
-  if (arg1) (arg1)->x = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ClampState2D_x_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
-  Dali::Toolkit::ClampState result;
-
-  arg1 = (Dali::Toolkit::ClampState2D *)jarg1;
-  result = (Dali::Toolkit::ClampState) ((arg1)->x);
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ClampState2D_y_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
-  Dali::Toolkit::ClampState arg2 ;
-
-  arg1 = (Dali::Toolkit::ClampState2D *)jarg1;
-  arg2 = (Dali::Toolkit::ClampState)jarg2;
-  if (arg1) (arg1)->y = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ClampState2D_y_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
-  Dali::Toolkit::ClampState result;
-
-  arg1 = (Dali::Toolkit::ClampState2D *)jarg1;
-  result = (Dali::Toolkit::ClampState) ((arg1)->y);
-  jresult = (int)result;
+  jresult = new Dali::Toolkit::ScrollViewPagePathEffect((const Dali::Toolkit::ScrollViewPagePathEffect &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ClampState2D() {
-  void * jresult ;
-  Dali::Toolkit::ClampState2D *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_ApplyToPage(void * jarg1, void * jarg2, unsigned int jarg3) {
+  Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
+  Dali::Actor arg2 ;
+  unsigned int arg3 ;
+  Dali::Actor *argp2 ;
 
+  arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *)jarg1;
+  argp2 = (Dali::Actor *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  arg3 = (unsigned int)jarg3;
   {
     try {
-      result = (Dali::Toolkit::ClampState2D *)new Dali::Toolkit::ClampState2D();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->ApplyToPage(arg2,arg3);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ClampState2D(void * jarg1) {
-  Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollViewPagePathEffect(void * jarg1) {
+  Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
 
-  arg1 = (Dali::Toolkit::ClampState2D *)jarg1;
+  arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *)jarg1;
   {
     try {
       delete arg1;
@@ -9568,100 +7977,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FixedRuler(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_scale_set(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState2D *arg2 = (Dali::Toolkit::ClampState2D *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  arg2 = (Dali::Toolkit::ClampState2D *)jarg2;
-  if (arg1) (arg1)->scale = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_scale_get(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState2D *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  result = (Dali::Toolkit::ClampState2D *)& ((arg1)->scale);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_position_set(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState2D *arg2 = (Dali::Toolkit::ClampState2D *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  arg2 = (Dali::Toolkit::ClampState2D *)jarg2;
-  if (arg1) (arg1)->position = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_position_get(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState2D *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  result = (Dali::Toolkit::ClampState2D *)& ((arg1)->position);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_rotation_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState arg2 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  arg2 = (Dali::Toolkit::ClampState)jarg2;
-  if (arg1) (arg1)->rotation = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_rotation_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-  Dali::Toolkit::ClampState result;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  result = (Dali::Toolkit::ClampState) ((arg1)->rotation);
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView_ClampEvent() {
-  void * jresult ;
-  Dali::Toolkit::ScrollView::ClampEvent *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView::ClampEvent *)new Dali::Toolkit::ScrollView::ClampEvent();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_ClampEvent(void * jarg1) {
-  Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_type_set(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   Dali::Toolkit::SnapType arg2 ;
@@ -9756,93 +8071,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_SnapEvent(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView_Property() {
-  void * jresult ;
-  Dali::Toolkit::ScrollView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView::Property *)new Dali::Toolkit::ScrollView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_Property(void * jarg1) {
-  Dali::Toolkit::ScrollView::Property *arg1 = (Dali::Toolkit::ScrollView::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::ScrollView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView *)new Dali::Toolkit::ScrollView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView *arg1 = 0 ;
-  Dali::Toolkit::ScrollView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ScrollView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView *)new Dali::Toolkit::ScrollView((Dali::Toolkit::ScrollView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-  Dali::Toolkit::ScrollView *arg2 = 0 ;
-  Dali::Toolkit::ScrollView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  arg2 = (Dali::Toolkit::ScrollView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ScrollView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView *) &(arg1)->operator =((Dali::Toolkit::ScrollView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView(void * jarg1) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
 
@@ -9871,27 +8099,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::ScrollView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::ScrollView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::ScrollView((const Dali::Toolkit::ScrollView &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollSnapAlphaFunction(void * jarg1) {
@@ -10434,44 +8641,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetMaxFlickSpeed(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetWheelScrollDistanceStep(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-  Dali::Vector2 result;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  {
-    try {
-      result = ((Dali::Toolkit::ScrollView const *)arg1)->GetWheelScrollDistanceStep();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Vector2((const Dali::Vector2 &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetWheelScrollDistanceStep(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-  Dali::Vector2 arg2 ;
-  Dali::Vector2 *argp2 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  argp2 = (Dali::Vector2 *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetWheelScrollDistanceStep(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetCurrentScrollPosition(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
@@ -10762,17 +8931,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ApplyConstraintToChildren(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveConstraintsFromChildren(void * jarg1) {
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  {
-    try {
-      (arg1)->RemoveConstraintsFromChildren();
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ApplyEffect(void * jarg1, void * jarg2) {
@@ -10910,91 +9068,48 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollingDirection__SWIG_1
   argp2 = (Dali::Radian *)jarg2;
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->SetScrollingDirection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveScrollingDirection(void * jarg1, void * jarg2) {
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-  Dali::Radian arg2 ;
-  Dali::Radian *argp2 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  argp2 = (Dali::Radian *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->RemoveScrollingDirection(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_SnapStartedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
-  Dali::Toolkit::ScrollView::SnapStartedSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::ScrollView::SnapStartedSignalType *) &(arg1)->SnapStartedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_Property() {
-  void * jresult ;
-  Dali::Toolkit::TableView::Property *result = 0 ;
-
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      result = (Dali::Toolkit::TableView::Property *)new Dali::Toolkit::TableView::Property();
-    } CALL_CATCH_EXCEPTION(0);
+      (arg1)->SetScrollingDirection(arg2);
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_Property(void * jarg1) {
-  Dali::Toolkit::TableView::Property *arg1 = (Dali::Toolkit::TableView::Property *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveScrollingDirection(void * jarg1, void * jarg2) {
+  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
+  Dali::Radian arg2 ;
+  Dali::Radian *argp2 ;
 
-  arg1 = (Dali::Toolkit::TableView::Property *)jarg1;
+  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
+  argp2 = (Dali::Radian *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Radian", 0);
+    return ;
+  }
+  arg2 = *argp2;
   {
     try {
-      delete arg1;
+      (arg1)->RemoveScrollingDirection(arg2);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_ChildProperty() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_SnapStartedSignal(void * jarg1) {
   void * jresult ;
-  Dali::Toolkit::TableView::ChildProperty *result = 0 ;
+  Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
+  Dali::Toolkit::ScrollView::SnapStartedSignalType *result = 0 ;
 
+  arg1 = (Dali::Toolkit::ScrollView *)jarg1;
   {
     try {
-      result = (Dali::Toolkit::TableView::ChildProperty *)new Dali::Toolkit::TableView::ChildProperty();
+      result = (Dali::Toolkit::ScrollView::SnapStartedSignalType *) &(arg1)->SnapStartedSignal();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -11003,19 +9118,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_ChildProperty() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_ChildProperty(void * jarg1) {
-  Dali::Toolkit::TableView::ChildProperty *arg1 = (Dali::Toolkit::TableView::ChildProperty *) 0 ;
-
-  arg1 = (Dali::Toolkit::TableView::ChildProperty *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_0(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4) {
   void * jresult ;
   unsigned int arg1 ;
@@ -11212,21 +9314,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_CellPosition(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::TableView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TableView *)new Dali::Toolkit::TableView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = 0 ;
@@ -11248,29 +9335,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  Dali::Toolkit::TableView *arg2 = 0 ;
-  Dali::Toolkit::TableView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  arg2 = (Dali::Toolkit::TableView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TableView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TableView *) &(arg1)->operator =((Dali::Toolkit::TableView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView(void * jarg1) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
 
@@ -11303,27 +9367,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_New(unsigned int jarg1, unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::TableView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::TableView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TableView((const Dali::Toolkit::TableView &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_TableView_AddChild(void * jarg1, void * jarg2, void * jarg3) {
@@ -11470,27 +9513,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteRow__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteRow__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  unsigned int arg2 ;
-  std::vector< Dali::Actor > *arg3 = 0 ;
-
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  arg3 = (std::vector< Dali::Actor > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->DeleteRow(arg2,*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_InsertColumn(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -11521,27 +9543,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteColumn__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteColumn__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  unsigned int arg2 ;
-  std::vector< Dali::Actor > *arg3 = 0 ;
-
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  arg3 = (std::vector< Dali::Actor > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->DeleteColumn(arg2,*arg3);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_Resize__SWIG_0(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -11559,29 +9560,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_Resize__SWIG_0(void * jarg1, u
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_Resize__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3, void * jarg4) {
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  unsigned int arg2 ;
-  unsigned int arg3 ;
-  std::vector< Dali::Actor > *arg4 = 0 ;
-
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  arg2 = (unsigned int)jarg2;
-  arg3 = (unsigned int)jarg3;
-  arg4 = (std::vector< Dali::Actor > *)jarg4;
-  if (!arg4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      (arg1)->Resize(arg2,arg3,*arg4);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetCellPadding(void * jarg1, void * jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Size arg2 ;
@@ -11832,38 +9810,8 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TableView_GetRelativeWidth(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_GetRows(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  unsigned int result;
-
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  {
-    try {
-      result = (unsigned int)(arg1)->GetRows();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_GetColumns(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
-  unsigned int result;
 
-  arg1 = (Dali::Toolkit::TableView *)jarg1;
-  {
-    try {
-      result = (unsigned int)(arg1)->GetColumns();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetCellAlignment(void * jarg1, void * jarg2, int jarg3, int jarg4) {
@@ -11890,35 +9838,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetCellAlignment(void * jarg1,
 
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel_Property() {
-  void * jresult ;
-  Dali::Toolkit::TextLabel::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TextLabel::Property *)new Dali::Toolkit::TextLabel::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextLabel_Property(void * jarg1) {
-  Dali::Toolkit::TextLabel::Property *arg1 = (Dali::Toolkit::TextLabel::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::TextLabel::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TextLabel result;
@@ -11933,32 +9852,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_0() {
   return jresult;
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_1(char * text) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::Toolkit::TextLabel result;
-
-  if (!text) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(text);
-  arg1 = &arg1_str;
-  {
-    try {
-      result = Dali::Toolkit::TextLabel::New((std::string const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextLabel((const Dali::Toolkit::TextLabel &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New_With_Style(bool hasStyle) {
   void * jresult ;
   Dali::Toolkit::TextLabel result;
@@ -12001,67 +9894,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New_With_String_Style(char *
 
   jresult = new Dali::Toolkit::TextLabel((const Dali::Toolkit::TextLabel &)result);
 
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::TextLabel *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TextLabel *)new Dali::Toolkit::TextLabel();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::TextLabel *arg1 = 0 ;
-  Dali::Toolkit::TextLabel *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TextLabel *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextLabel const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextLabel *)new Dali::Toolkit::TextLabel((Dali::Toolkit::TextLabel const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::TextLabel *arg1 = (Dali::Toolkit::TextLabel *) 0 ;
-  Dali::Toolkit::TextLabel *arg2 = 0 ;
-  Dali::Toolkit::TextLabel *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TextLabel *)jarg1;
-  arg2 = (Dali::Toolkit::TextLabel *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextLabel const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextLabel *) &(arg1)->operator =((Dali::Toolkit::TextLabel const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
+  //argout typemap for const std::string&
+
   return jresult;
 }
 
@@ -12079,29 +9913,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextLabel(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::TextLabel result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::TextLabel::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextLabel((const Dali::Toolkit::TextLabel &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AccessibilityManager() {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *result = 0 ;
@@ -13295,32 +11106,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StyleManager_StyleChangedSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView_Property() {
-  void * jresult ;
-  Dali::Toolkit::VideoView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::VideoView::Property *)new Dali::Toolkit::VideoView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoView_Property(void * jarg1) {
-  Dali::Toolkit::VideoView::Property *arg1 = (Dali::Toolkit::VideoView::Property *) 0 ;
 
-  arg1 = (Dali::Toolkit::VideoView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_New__SWIG_0() {
@@ -13404,38 +11191,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_New__SWIG_3(char * jarg1, bo
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_New__SWIG_4(unsigned int jarg1) {
-  void * jresult ;
-  Dali::VideoSyncMode syncMode;
-  Dali::Toolkit::VideoView result;
-
-  syncMode = static_cast<Dali::VideoSyncMode>(jarg1);
-
-  {
-    try {
-      result = Dali::Toolkit::DevelVideoView::New(syncMode);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::VideoView((const Dali::Toolkit::VideoView &)result);
-
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::VideoView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::VideoView *)new Dali::Toolkit::VideoView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoView(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
@@ -13450,73 +11205,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::VideoView *arg1 = 0 ;
-  Dali::Toolkit::VideoView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::VideoView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::VideoView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::VideoView *)new Dali::Toolkit::VideoView((Dali::Toolkit::VideoView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
-  Dali::Toolkit::VideoView *arg2 = 0 ;
-  Dali::Toolkit::VideoView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::VideoView *)jarg1;
-  arg2 = (Dali::Toolkit::VideoView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::VideoView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::VideoView *) &(arg1)->operator =((Dali::Toolkit::VideoView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::VideoView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::VideoView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::VideoView((const Dali::Toolkit::VideoView &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Play(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
 
@@ -13617,207 +11305,55 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_GetNativePlayerHandle(void *
       Dali::Any result = Toolkit::DevelVideoView::GetMediaPlayer( *arg1 );
       ret = Dali::AnyCast< void * >( result );
 
-    } CALL_CATCH_EXCEPTION(0);
-  }
-  return ret;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraView_New__SWIG_0(void * jarg1, int jarg2) {
-  void * jresult ;
-  Dali::Toolkit::CameraView result;
-
-  Dali::Any arg1(jarg1);
-  Dali::Toolkit::CameraView::DisplayType arg2 = static_cast<Dali::Toolkit::CameraView::DisplayType>(jarg2);
-  {
-    try {
-      result = Dali::Toolkit::CameraView::New(arg1, arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::CameraView((const Dali::Toolkit::CameraView &)result);
-  return jresult;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::CameraView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::CameraView *)new Dali::Toolkit::CameraView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraView(void * jarg1) {
-  Dali::Toolkit::CameraView *arg1 = (Dali::Toolkit::CameraView *) 0 ;
-
-  arg1 = (Dali::Toolkit::CameraView *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::CameraView *arg1 = 0 ;
-  Dali::Toolkit::CameraView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::CameraView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::CameraView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::CameraView *)new Dali::Toolkit::CameraView((Dali::Toolkit::CameraView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::CameraView *arg1 = (Dali::Toolkit::CameraView *) 0 ;
-  Dali::Toolkit::CameraView *arg2 = 0 ;
-  Dali::Toolkit::CameraView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::CameraView *)jarg1;
-  arg2 = (Dali::Toolkit::CameraView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::CameraView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::CameraView *) &(arg1)->operator =((Dali::Toolkit::CameraView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::CameraView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::CameraView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::CameraView((const Dali::Toolkit::CameraView &)result);
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraView_Update(void * jarg1) {
-  Dali::Toolkit::CameraView *arg1 = (Dali::Toolkit::CameraView *) 0 ;
-
-  arg1 = (Dali::Toolkit::CameraView *)jarg1;
-  {
-    try {
-      (arg1)->Update();
-    } CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_PlayAnimation(void * jarg1, void * jarg2)
-{
-  Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView*)jarg1;
-  if(arg1 == nullptr)
-  {
-    DALI_LOG_ERROR("VideoView is nullptr!");
-    return;
-  }
-  Dali::Animation *arg2 = (Dali::Animation*)jarg2;
-  if(arg2 == nullptr)
-  {
-    DALI_LOG_ERROR("Animation is nullptr!");
-    return;
-  }
-
-  {
-    try{
-
-      Toolkit::DevelVideoView::PlayAnimation(*arg1, *arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraView_New__SWIG_0(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::GaussianBlurView *result = 0 ;
+  Dali::Toolkit::CameraView result;
 
+  Dali::Any arg1(jarg1);
+  Dali::Toolkit::CameraView::DisplayType arg2 = static_cast<Dali::Toolkit::CameraView::DisplayType>(jarg2);
   {
     try {
-      result = (Dali::Toolkit::GaussianBlurView *)new Dali::Toolkit::GaussianBlurView();
+      result = Dali::Toolkit::CameraView::New(arg1, arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = (void *)result;
+  jresult = new Dali::Toolkit::CameraView((const Dali::Toolkit::CameraView &)result);
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::GaussianBlurView *arg1 = 0 ;
-  Dali::Toolkit::GaussianBlurView *result = 0 ;
 
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::GaussianBlurView const & type is null", 0);
-    return 0;
-  }
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraView(void * jarg1) {
+  Dali::Toolkit::CameraView *arg1 = (Dali::Toolkit::CameraView *) 0 ;
+
+  arg1 = (Dali::Toolkit::CameraView *)jarg1;
   {
     try {
-      result = (Dali::Toolkit::GaussianBlurView *)new Dali::Toolkit::GaussianBlurView((Dali::Toolkit::GaussianBlurView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = (void *)result;
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraView__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
-  Dali::Toolkit::GaussianBlurView *arg2 = 0 ;
-  Dali::Toolkit::GaussianBlurView *result = 0 ;
+  Dali::Toolkit::CameraView *arg1 = 0 ;
+  Dali::Toolkit::CameraView *result = 0 ;
 
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
-  arg2 = (Dali::Toolkit::GaussianBlurView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::GaussianBlurView const & type is null", 0);
+  arg1 = (Dali::Toolkit::CameraView *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::CameraView const & type is null", 0);
     return 0;
   }
   {
     try {
-      result = (Dali::Toolkit::GaussianBlurView *) &(arg1)->operator =((Dali::Toolkit::GaussianBlurView const &)*arg2);
+      result = (Dali::Toolkit::CameraView *)new Dali::Toolkit::CameraView((Dali::Toolkit::CameraView const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -13826,76 +11362,59 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GaussianBlurView(void * jarg1) {
-  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraView_Update(void * jarg1) {
+  Dali::Toolkit::CameraView *arg1 = (Dali::Toolkit::CameraView *) 0 ;
 
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
+  arg1 = (Dali::Toolkit::CameraView *)jarg1;
   {
     try {
-      delete arg1;
+      (arg1)->Update();
     } CALL_CATCH_EXCEPTION();
   }
-
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurView__SWIG_1(void * jarg1) {
   void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::GaussianBlurView result;
+  Dali::Toolkit::GaussianBlurView *arg1 = 0 ;
+  Dali::Toolkit::GaussianBlurView *result = 0 ;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::GaussianBlurView const & type is null", 0);
     return 0;
   }
-  arg1 = *argp1;
   {
     try {
-      result = Dali::Toolkit::GaussianBlurView::DownCast(arg1);
+      result = (Dali::Toolkit::GaussianBlurView *)new Dali::Toolkit::GaussianBlurView((Dali::Toolkit::GaussianBlurView const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Toolkit::GaussianBlurView((const Dali::Toolkit::GaussianBlurView &)result);
+  jresult = (void *)result;
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::GaussianBlurView result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GaussianBlurView(void * jarg1) {
+  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
 
+  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
   {
     try {
-      result = Dali::Toolkit::GaussianBlurView::New();
-    } CALL_CATCH_EXCEPTION(0);
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
   }
 
-  jresult = new Dali::Toolkit::GaussianBlurView((const Dali::Toolkit::GaussianBlurView &)result);
-  return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_1(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5, bool jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_0() {
   void * jresult ;
-  unsigned int arg1 ;
-  float arg2 ;
-  Dali::Pixel::Format arg3 ;
-  float arg4 ;
-  float arg5 ;
-  bool arg6 ;
   Dali::Toolkit::GaussianBlurView result;
 
-  arg1 = (unsigned int)jarg1;
-  arg2 = (float)jarg2;
-  arg3 = (Dali::Pixel::Format)jarg3;
-  arg4 = (float)jarg4;
-  arg5 = (float)jarg5;
-  arg6 = jarg6 ? true : false;
   {
     try {
-      result = Dali::Toolkit::GaussianBlurView::New(arg1,arg2,arg3,arg4,arg5,arg6);
+      result = Dali::Toolkit::GaussianBlurView::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -13904,13 +11423,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_1(unsigned
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_2(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_1(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5, bool jarg6) {
   void * jresult ;
   unsigned int arg1 ;
   float arg2 ;
   Dali::Pixel::Format arg3 ;
   float arg4 ;
   float arg5 ;
+  bool arg6 ;
   Dali::Toolkit::GaussianBlurView result;
 
   arg1 = (unsigned int)jarg1;
@@ -13918,9 +11438,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_2(unsigned
   arg3 = (Dali::Pixel::Format)jarg3;
   arg4 = (float)jarg4;
   arg5 = (float)jarg5;
+  arg6 = jarg6 ? true : false;
   {
     try {
-      result = Dali::Toolkit::GaussianBlurView::New(arg1,arg2,arg3,arg4,arg5);
+      result = Dali::Toolkit::GaussianBlurView::New(arg1,arg2,arg3,arg4,arg5,arg6);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -13929,48 +11450,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_2(unsigned
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Add(void * jarg1, void * jarg2) {
-  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->Add(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Remove(void * jarg1, void * jarg2) {
-  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
-  Dali::Actor arg2 ;
-  Dali::Actor *argp2 ;
-
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
-  argp2 = (Dali::Actor *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      (arg1)->Remove(arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Activate(void * jarg1) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
 
@@ -14056,23 +11535,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GaussianBlurView_GetBlurStrengthPropertyI
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_GetBlurredRenderTarget(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
-  Dali::FrameBuffer result;
-
-  arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1;
-  {
-    try {
-      result = ((Dali::Toolkit::GaussianBlurView const *)arg1)->GetBlurredRenderTarget();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::FrameBuffer((const Dali::FrameBuffer &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_SetBackgroundColor(void * jarg1, void * jarg2) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -14175,34 +11637,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageFactory_NewPage(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnView_Property() {
-  void * jresult ;
-  Dali::Toolkit::PageTurnView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::PageTurnView::Property *)new Dali::Toolkit::PageTurnView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnView_Property(void * jarg1) {
-  Dali::Toolkit::PageTurnView::Property *arg1 = (Dali::Toolkit::PageTurnView::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::PageTurnView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::PageTurnView *result = 0 ;
@@ -14275,27 +11709,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::PageTurnView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::PageTurnView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::PageTurnView((const Dali::Toolkit::PageTurnView &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PageTurnStartedSignal(void * jarg1) {
@@ -14366,19 +11779,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PagePanFinishedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnLandscapeView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::PageTurnLandscapeView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::PageTurnLandscapeView *)new Dali::Toolkit::PageTurnLandscapeView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnLandscapeView__SWIG_1(void * jarg1) {
@@ -14465,42 +11865,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_New(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::PageTurnLandscapeView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::PageTurnLandscapeView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::PageTurnLandscapeView((const Dali::Toolkit::PageTurnLandscapeView &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnPortraitView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
 
-  {
-    try {
-      result = (Dali::Toolkit::PageTurnPortraitView *)new Dali::Toolkit::PageTurnPortraitView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnPortraitView__SWIG_1(void * jarg1) {
@@ -14571,37 +11937,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_New(void * jarg1,
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageFactory & type is null", 0);
     return 0;
   }
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = Dali::Toolkit::PageTurnPortraitView::New(*arg1,(Dali::Vector2 const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::PageTurnPortraitView((const Dali::Toolkit::PageTurnPortraitView &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::PageTurnPortraitView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return 0;
+  }
   {
     try {
-      result = Dali::Toolkit::PageTurnPortraitView::DownCast(arg1);
+      result = Dali::Toolkit::PageTurnPortraitView::New(*arg1,(Dali::Vector2 const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -14609,6 +11952,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_DownCast(void * j
   return jresult;
 }
 
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualBase__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Visual::Base *result = 0 ;
@@ -14658,27 +12003,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualBase__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualBase_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
-  Dali::Toolkit::Visual::Base *arg2 = 0 ;
-  Dali::Toolkit::Visual::Base *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Visual::Base *)jarg1;
-  arg2 = (Dali::Toolkit::Visual::Base *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Visual::Base const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Visual::Base *) &(arg1)->operator =((Dali::Toolkit::Visual::Base const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_SetName(void * jarg1, char * jarg2) {
@@ -14886,61 +12210,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualFactory__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VisualFactory(void * jarg1) {
-  Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
-
-  arg1 = (Dali::Toolkit::VisualFactory *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualFactory__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::VisualFactory *arg1 = 0 ;
-  Dali::Toolkit::VisualFactory *result = 0 ;
-
-  arg1 = (Dali::Toolkit::VisualFactory *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::VisualFactory const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::VisualFactory *)new Dali::Toolkit::VisualFactory((Dali::Toolkit::VisualFactory const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
-  Dali::Toolkit::VisualFactory *arg2 = 0 ;
-  Dali::Toolkit::VisualFactory *result = 0 ;
 
-  arg1 = (Dali::Toolkit::VisualFactory *)jarg1;
-  arg2 = (Dali::Toolkit::VisualFactory *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::VisualFactory const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::VisualFactory *) &(arg1)->operator =((Dali::Toolkit::VisualFactory const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_0(void * jarg1, void * jarg2) {
@@ -14966,39 +12239,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_0(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
-  std::string *arg2 = 0 ;
-  Dali::ImageDimensions arg3 ;
-  Dali::ImageDimensions *argp3 ;
-  Dali::Toolkit::Visual::Base result;
-
-  arg1 = (Dali::Toolkit::VisualFactory *)jarg1;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  argp3 = (Dali::ImageDimensions *)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
-    return 0;
-  }
-  arg3 = *argp3;
-  {
-    try {
-      result = (arg1)->CreateVisual((std::string const &)*arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Visual::Base((const Dali::Toolkit::Visual::Base &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualFactory_UsePreCompiledShader(void* csVisualFactory)
 {
@@ -15016,19 +12256,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualFactory_UsePreCompiledShader(void*
   CALL_CATCH_EXCEPTION();
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AsyncImageLoader__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::AsyncImageLoader *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::AsyncImageLoader *)new Dali::Toolkit::AsyncImageLoader();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AsyncImageLoader(void * jarg1) {
@@ -15103,27 +12330,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::AsyncImageLoader result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::AsyncImageLoader::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::AsyncImageLoader((const Dali::Toolkit::AsyncImageLoader &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Load__SWIG_0(void * jarg1, char * jarg2) {
@@ -15278,101 +12484,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_ImageLoadedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_0(char * jarg1) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::PixelData result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  {
-    try {
-      result = Dali::Toolkit::SyncImageLoader::Load((std::string const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PixelData((const Dali::PixelData &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_1(char * jarg1, void * jarg2) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::ImageDimensions arg2 ;
-  Dali::ImageDimensions *argp2 ;
-  Dali::PixelData result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  argp2 = (Dali::ImageDimensions *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      result = Dali::Toolkit::SyncImageLoader::Load((std::string const &)*arg1,arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PixelData((const Dali::PixelData &)result);
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_2(char * jarg1, void * jarg2, int jarg3, int jarg4, bool jarg5) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  Dali::ImageDimensions arg2 ;
-  Dali::FittingMode::Type arg3 ;
-  Dali::SamplingMode::Type arg4 ;
-  bool arg5 ;
-  Dali::ImageDimensions *argp2 ;
-  Dali::PixelData result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  argp2 = (Dali::ImageDimensions *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::ImageDimensions", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::FittingMode::Type)jarg3;
-  arg4 = (Dali::SamplingMode::Type)jarg4;
-  arg5 = jarg5 ? true : false;
-  {
-    try {
-      result = Dali::Toolkit::SyncImageLoader::Load((std::string const &)*arg1,arg2,arg3,arg4,arg5);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::PixelData((const Dali::PixelData &)result);
 
-  //argout typemap for const std::string&
 
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CustomAlgorithmInterface(void * jarg1) {
@@ -17394,56 +14509,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewResourceReadySignal(void * ja
 }
 
 // Method
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Builder_SWIGUpcast(Dali::Toolkit::Builder *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
-
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TransitionData_SWIGUpcast(Dali::Toolkit::TransitionData *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::CustomActorImpl * SWIGSTDCALL CSharp_Dali_ViewImpl_SWIGUpcast(Dali::Toolkit::Internal::Control *jarg1) {
-    return (Dali::CustomActorImpl *)jarg1;
-}
 
-SWIGEXPORT Dali::CustomActor * SWIGSTDCALL CSharp_Dali_View_SWIGUpcast(Dali::Toolkit::Control *jarg1) {
-    return (Dali::CustomActor *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_SWIGUpcast(Dali::Toolkit::KeyInputFocusManager *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Alignment_SWIGUpcast(Dali::Toolkit::Alignment *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_FlexContainer_SWIGUpcast(Dali::Toolkit::FlexContainer *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ImageView_SWIGUpcast(Dali::Toolkit::ImageView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Model3dView_SWIGUpcast(Dali::Toolkit::Model3dView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ScrollBar_SWIGUpcast(Dali::Toolkit::ScrollBar *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Scrollable_SWIGUpcast(Dali::Toolkit::Scrollable *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_ItemLayout_SWIGUpcast(Dali::Toolkit::ItemLayout *jarg1) {
-    return (Dali::RefObject *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_Dali_ItemView_SWIGUpcast(Dali::Toolkit::ItemView *jarg1) {
-    return (Dali::Toolkit::Scrollable *)jarg1;
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ImageView_SWIGUpcast(Dali::Toolkit::ImageView *jarg1) {
+    return (Dali::Toolkit::Control *)jarg1;
 }
 
 SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_ScrollViewEffect_SWIGUpcast(Dali::Toolkit::ScrollViewEffect *jarg1) {
@@ -17454,74 +14532,26 @@ SWIGEXPORT Dali::Toolkit::ScrollViewEffect * SWIGSTDCALL CSharp_Dali_ScrollViewP
     return (Dali::Toolkit::ScrollViewEffect *)jarg1;
 }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_Ruler_SWIGUpcast(Dali::Toolkit::Ruler *jarg1) {
-    return (Dali::RefObject *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_Dali_DefaultRuler_SWIGUpcast(Dali::Toolkit::DefaultRuler *jarg1) {
-    return (Dali::Toolkit::Ruler *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_Dali_FixedRuler_SWIGUpcast(Dali::Toolkit::FixedRuler *jarg1) {
-    return (Dali::Toolkit::Ruler *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_Dali_ScrollView_SWIGUpcast(Dali::Toolkit::ScrollView *jarg1) {
-    return (Dali::Toolkit::Scrollable *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TableView_SWIGUpcast(Dali::Toolkit::TableView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextLabel_SWIGUpcast(Dali::Toolkit::TextLabel *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_AccessibilityManager_SWIGUpcast(Dali::Toolkit::AccessibilityManager *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_StyleManager_SWIGUpcast(Dali::Toolkit::StyleManager *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_VideoView_SWIGUpcast(Dali::Toolkit::VideoView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_CameraView_SWIGUpcast(Dali::Toolkit::CameraView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_GaussianBlurView_SWIGUpcast(Dali::Toolkit::GaussianBlurView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_PageTurnView_SWIGUpcast(Dali::Toolkit::PageTurnView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_SWIGUpcast(Dali::Toolkit::PageTurnLandscapeView *jarg1) {
     return (Dali::Toolkit::PageTurnView *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_SWIGUpcast(Dali::Toolkit::PageTurnPortraitView *jarg1) {
-    return (Dali::Toolkit::PageTurnView *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_VisualBase_SWIGUpcast(Dali::Toolkit::Visual::Base *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_VisualFactory_SWIGUpcast(Dali::Toolkit::VisualFactory *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_SWIGUpcast(Dali::Toolkit::AsyncImageLoader *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/dali-csharp-binder/dali-toolkit/fade-transition-wrap.cpp b/dali-csharp-binder/dali-toolkit/fade-transition-wrap.cpp
index b364261f..f100d92b 100755
--- a/dali-csharp-binder/dali-toolkit/fade-transition-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/fade-transition-wrap.cpp
@@ -26,22 +26,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_FadeTransition()
-  {
-    void *jresult;
-    Dali::Toolkit::FadeTransition *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::FadeTransition *)new Dali::Toolkit::FadeTransition();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_FadeTransition_New(void *nuiControl, float nuiOpaicty, void *nuiTimePeriod)
   {
diff --git a/dali-csharp-binder/dali-toolkit/gl-view-wrap.cpp b/dali-csharp-binder/dali-toolkit/gl-view-wrap.cpp
index 28b95fc7..31871395 100644
--- a/dali-csharp-binder/dali-toolkit/gl-view-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/gl-view-wrap.cpp
@@ -69,86 +69,9 @@ extern "C"
     return jresult;
   }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_GlView_SWIG_0()
-  {
-    void *jresult;
-    Dali::Toolkit::GlView *result = nullptr;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::GlView *)new Dali::Toolkit::GlView();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
-
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_GlView_SWIG_1(void *nuiGlView)
-  {
-    void *jresult;
-    Dali::Toolkit::GlView *glView = nullptr;
-    Dali::Toolkit::GlView *result = nullptr;
 
-    glView = (Dali::Toolkit::GlView *)nuiGlView;
-    if (!glView)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::GlView const & type is null", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = (Dali::Toolkit::GlView *)new Dali::Toolkit::GlView((Dali::Toolkit::GlView const &)*glView);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
 
-    jresult = (void *)result;
-    return jresult;
-  }
 
-  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GlView(void *nuiGlView)
-  {
-    Dali::Toolkit::GlView *glView = nullptr;
-
-    glView = (Dali::Toolkit::GlView *)nuiGlView;
-    {
-      try
-      {
-        delete glView;
-      }
-      CALL_CATCH_EXCEPTION();
-    }
-  }
-
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_GlView_Assign(void *nuiGlView1, void *nuiGlView2)
-  {
-    void *jresult;
-    Dali::Toolkit::GlView *glView1 = nullptr;
-    Dali::Toolkit::GlView *glView2 = nullptr;
-    Dali::Toolkit::GlView *result = nullptr;
-
-    glView1 = (Dali::Toolkit::GlView *)nuiGlView1;
-    glView2 = (Dali::Toolkit::GlView *)nuiGlView2;
-    if (!glView2)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::GlView const & type is null", 0);
-      return 0;
-    }
-    {
-      try
-      {
-        result = (Dali::Toolkit::GlView *)&(glView1)->operator=((Dali::Toolkit::GlView const &)*glView2);
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GlView_SetGraphicsConfig(void *nuiGlView, bool nuiDepth, bool nuiStencil, int nuiMsaa, int nuiVersion)
   {
@@ -290,32 +213,6 @@ extern "C"
     }
   }
 
-  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GlView_GetBackendMode(void *nuiGlView)
-  {
-    int jresult;
-    Dali::Toolkit::GlView *glView = nullptr;
-    Dali::Toolkit::GlView::BackendMode result;
-
-    glView = (Dali::Toolkit::GlView *)nuiGlView;
-    if (!glView)
-    {
-      SWIG_CSharpSetPendingExceptionArgument(
-          SWIG_CSharpArgumentNullException,
-          "Attempt to dereference null Dali::Toolkit::GlView", 0);
-      return 0;
-    }
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::GlView::BackendMode)(glView)->GetBackendMode();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (int)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_RenderCallbackInput_Size_get(void *input)
   {
diff --git a/dali-csharp-binder/dali-toolkit/keyboard-focus-manager-wrap.cpp b/dali-csharp-binder/dali-toolkit/keyboard-focus-manager-wrap.cpp
index e87fc98b..04a407a6 100755
--- a/dali-csharp-binder/dali-toolkit/keyboard-focus-manager-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/keyboard-focus-manager-wrap.cpp
@@ -58,17 +58,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_KeyboardFocusManager() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_KeyboardFocusManager(void * jarg1) {
-  Dali::Toolkit::KeyboardFocusManager *arg1 = (Dali::Toolkit::KeyboardFocusManager *) 0 ;
-
-  arg1 = (Dali::Toolkit::KeyboardFocusManager *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_KeyboardFocusManager_Get() {
@@ -578,9 +567,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_KeyboardPreFocusChangeSignal(void * ja
 
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_KeyboardFocusManager_SWIGUpcast(Dali::Toolkit::KeyboardFocusManager *jarg1) {
-    return (Dali::BaseHandle *)jarg1;
-}
 
 #ifdef __cplusplus
 }
diff --git a/dali-csharp-binder/dali-toolkit/scale-transition-wrap.cpp b/dali-csharp-binder/dali-toolkit/scale-transition-wrap.cpp
index d3e6816f..d402a954 100755
--- a/dali-csharp-binder/dali-toolkit/scale-transition-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/scale-transition-wrap.cpp
@@ -26,23 +26,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_ScaleTransition()
-  {
-    void *jresult;
-    Dali::Toolkit::ScaleTransition *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::ScaleTransition *)new Dali::Toolkit::ScaleTransition();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
-
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_ScaleTransition_New_1(void *nuiControl, float scale, void *nuiTimePeriod)
   {
     void *jresult;
diff --git a/dali-csharp-binder/dali-toolkit/slide-transition-wrap.cpp b/dali-csharp-binder/dali-toolkit/slide-transition-wrap.cpp
index d0bd7324..80363a06 100755
--- a/dali-csharp-binder/dali-toolkit/slide-transition-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/slide-transition-wrap.cpp
@@ -26,23 +26,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_SlideTransition()
-  {
-    void *jresult;
-    Dali::Toolkit::SlideTransition *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::SlideTransition *)new Dali::Toolkit::SlideTransition();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
-
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_SlideTransition_New(void *nuiControl, void *nuiDirection, void *nuiTimePeriod)
   {
     void *jresult;
diff --git a/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp b/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp
index 5bf27c54..f9d830e7 100755
--- a/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp
@@ -62,19 +62,8 @@ SWIGINTERN void Dali_Signal_void_TextEditor_Scroll_Type__Emit(Dali::Signal< void
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextEditor_SWIGUpcast(Dali::Toolkit::TextEditor *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 /*TextEditor Property binding*/
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_RENDERING_BACKEND_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::DevelTextEditor::Property::RENDERING_BACKEND;
-  jresult = (int)result;
-  return jresult;
-}
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_TEXT_get() {
@@ -724,75 +713,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_METHOD_SETTINGS
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor_Property() {
-  void * jresult ;
-  Dali::Toolkit::TextEditor::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TextEditor::Property *)new Dali::Toolkit::TextEditor::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor_Property(void * jarg1) {
-  Dali::Toolkit::TextEditor::Property *arg1 = (Dali::Toolkit::TextEditor::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::TextEditor::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor_InputStyle() {
-  void * jresult ;
-  Dali::Toolkit::TextEditor::InputStyle *result = 0 ;
 
-  {
-    try {
-      result = (Dali::Toolkit::TextEditor::InputStyle *)new Dali::Toolkit::TextEditor::InputStyle();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor_InputStyle(void * jarg1) {
-  Dali::Toolkit::TextEditor::InputStyle *arg1 = (Dali::Toolkit::TextEditor::InputStyle *) 0 ;
 
-  arg1 = (Dali::Toolkit::TextEditor::InputStyle *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_New() {
-  void * jresult ;
-  Dali::Toolkit::TextEditor result;
-
-  {
-    try {
-      result = Dali::Toolkit::TextEditor::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextEditor((const Dali::Toolkit::TextEditor &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_New_With_Style(bool hasStyle) {
@@ -814,63 +742,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_New_With_Style(bool hasStyl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::TextEditor *result = 0 ;
 
-  {
-    try {
-      result = (Dali::Toolkit::TextEditor *)new Dali::Toolkit::TextEditor();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::TextEditor *arg1 = 0 ;
-  Dali::Toolkit::TextEditor *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TextEditor *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextEditor const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextEditor *)new Dali::Toolkit::TextEditor((Dali::Toolkit::TextEditor const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
-  Dali::Toolkit::TextEditor *arg2 = 0 ;
-  Dali::Toolkit::TextEditor *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TextEditor *)jarg1;
-  arg2 = (Dali::Toolkit::TextEditor *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextEditor const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextEditor *) &(arg1)->operator =((Dali::Toolkit::TextEditor const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor(void * jarg1) {
@@ -886,27 +761,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::TextEditor result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::TextEditor::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextEditor((const Dali::Toolkit::TextEditor &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_TextChangedSignal(void * jarg1) {
diff --git a/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp b/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp
index a760858d..9bec8f5d 100755
--- a/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp
@@ -46,19 +46,8 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextField_SP__Sg__Emit(Dali:
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextField_SWIGUpcast(Dali::Toolkit::TextField *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 /*TextField property binding*/
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_RENDERING_BACKEND_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::DevelTextField::Property::RENDERING_BACKEND;
-  jresult = (int)result;
-  return jresult;
-}
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_TEXT_get() {
@@ -646,75 +635,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_POPUP_STYLE_
   return (int)Dali::Toolkit::DevelTextField::Property::SELECTION_POPUP_STYLE;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField_Property() {
-  void * jresult ;
-  Dali::Toolkit::TextField::Property *result = 0 ;
 
-  {
-    try {
-      result = (Dali::Toolkit::TextField::Property *)new Dali::Toolkit::TextField::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField_Property(void * jarg1) {
-  Dali::Toolkit::TextField::Property *arg1 = (Dali::Toolkit::TextField::Property *) 0 ;
 
-  arg1 = (Dali::Toolkit::TextField::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField_InputStyle() {
-  void * jresult ;
-  Dali::Toolkit::TextField::InputStyle *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TextField::InputStyle *)new Dali::Toolkit::TextField::InputStyle();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField_InputStyle(void * jarg1) {
-  Dali::Toolkit::TextField::InputStyle *arg1 = (Dali::Toolkit::TextField::InputStyle *) 0 ;
-
-  arg1 = (Dali::Toolkit::TextField::InputStyle *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_New() {
-  void * jresult ;
-  Dali::Toolkit::TextField result;
-
-  {
-    try {
-      result = Dali::Toolkit::TextField::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextField((const Dali::Toolkit::TextField &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_New_With_Style(bool hasStyle) {
@@ -736,63 +664,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_New_With_Style(bool hasStyle
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::TextField *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::TextField *)new Dali::Toolkit::TextField();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::TextField *arg1 = 0 ;
-  Dali::Toolkit::TextField *result = 0 ;
-
-  arg1 = (Dali::Toolkit::TextField *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextField const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextField *)new Dali::Toolkit::TextField((Dali::Toolkit::TextField const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
-  Dali::Toolkit::TextField *arg2 = 0 ;
-  Dali::Toolkit::TextField *result = 0 ;
 
-  arg1 = (Dali::Toolkit::TextField *)jarg1;
-  arg2 = (Dali::Toolkit::TextField *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::TextField const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::TextField *) &(arg1)->operator =((Dali::Toolkit::TextField const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField(void * jarg1) {
@@ -808,27 +683,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::TextField result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::TextField::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::TextField((const Dali::Toolkit::TextField &)result);
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_TextChangedSignal(void * jarg1) {
diff --git a/dali-csharp-binder/dali-toolkit/transition-base-wrap.cpp b/dali-csharp-binder/dali-toolkit/transition-base-wrap.cpp
index 71af2c4c..25a2f1b5 100755
--- a/dali-csharp-binder/dali-toolkit/transition-base-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/transition-base-wrap.cpp
@@ -26,22 +26,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_TransitionBase()
-  {
-    void *jresult;
-    Dali::Toolkit::TransitionBase *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::TransitionBase *)new Dali::Toolkit::TransitionBase();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_TransitionBase_New()
   {
diff --git a/dali-csharp-binder/dali-toolkit/transition-effects-wrap.cpp b/dali-csharp-binder/dali-toolkit/transition-effects-wrap.cpp
index b325735e..d0f62e71 100755
--- a/dali-csharp-binder/dali-toolkit/transition-effects-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/transition-effects-wrap.cpp
@@ -1,503 +1,471 @@
-/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/rendering/texture.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h>
-
-// INTERNAL INCLUDES
-#include <dali-csharp-binder/common/common.h>
-
-SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Empty(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *self) {
-  return self->Empty();
-}
-SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__GetConnectionCount(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *self) {
-  return self->GetConnectionCount();
-}
-SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Connect(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, void(*func)(Dali::Toolkit::CubeTransitionEffect)) {
-  self->Connect(func);
-}
-SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Disconnect(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, void(*func)(Dali::Toolkit::CubeTransitionEffect)) {
-  self->Disconnect(func);
-}
-SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Emit(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, Dali::Toolkit::CubeTransitionEffect arg) {
-  self->Emit(arg);
-}
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// cube-transition-effect.h
-
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SWIGUpcast(Dali::Toolkit::CubeTransitionEffect *jarg1) {
-  return (Dali::Toolkit::Control *)jarg1;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CubeTransitionEffect() {
-  Dali::Toolkit::CubeTransitionEffect* result;
-
-  {
-    try {
-      result = new Dali::Toolkit::CubeTransitionEffect();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return result;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionEffect(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetTransitionDuration(void * jarg1, float duration) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      (arg1)->SetTransitionDuration(duration);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_GetTransitionDuration(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  float result = 0.0f;
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      result = (arg1)->GetTransitionDuration();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  return result;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetCubeDisplacement(void * jarg1, float displacement) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      (arg1)->SetCubeDisplacement(displacement);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_GetCubeDisplacement(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  float result = 0.0f;
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      result = (arg1)->GetCubeDisplacement();
-    }
-    CALL_CATCH_EXCEPTION(0.0f);
-  }
-
-  return result;
-}
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_IsTransitioning(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  bool result = false;
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      result = (arg1)->IsTransitioning();
-    }
-    CALL_CATCH_EXCEPTION(false);
-  }
-
-  unsigned int jresult = result; // convert bool to unsigned int.
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetCurrentTexture(void* jarg1, void* jarg2) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  Dali::Texture* argp2 = (Dali::Texture*)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
-    return ;
-  }
-
-  {
-    try {
-      (arg1)->SetCurrentTexture(*argp2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetTargetTexture(void* jarg1, void* jarg2) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  Dali::Texture* argp2 = (Dali::Texture*)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
-    return;
-  }
-
-  {
-    try {
-      (arg1)->SetTargetTexture(*argp2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StartTransition__SWIG1(void* jarg1, bool toNextImage) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-
-  {
-    try {
-      (arg1)->StartTransition(toNextImage);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StartTransition__SWIG2(void* jarg1, void* jarg2, void* jarg3) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-
-  Dali::Vector2* argp2 = (Dali::Vector2*)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
-    return;
-  }
-
-  Dali::Vector2* argp3 = (Dali::Vector2*)jarg3;
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
-    return;
-  }
-
-  {
-    try {
-      (arg1)->StartTransition(*argp2, *argp3);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_PauseTransition(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      (arg1)->PauseTransition();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_ResumeTransition(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      (arg1)->ResumeTransition();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StopTransition(void * jarg1) {
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      (arg1)->StopTransition();
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_TransitionCompletedSignal(void * jarg1) {
-  void * jresult;
-  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
-  Dali::Toolkit::CubeTransitionEffect::TransitionCompletedSignalType *result = 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::CubeTransitionEffect::TransitionCompletedSignalType *) &(arg1)->TransitionCompletedSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Empty(void * jarg1) {
-  unsigned int jresult;
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-  bool result;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Empty((Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult;
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-  std::size_t result;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  {
-    try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__GetConnectionCount((Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-  void(*arg2)(Dali::Toolkit::CubeTransitionEffect) = (void(*)(Dali::Toolkit::CubeTransitionEffect)) 0;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  arg2 = (void(*)(Dali::Toolkit::CubeTransitionEffect))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Connect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-  void(*arg2)(Dali::Toolkit::CubeTransitionEffect) = (void(*)(Dali::Toolkit::CubeTransitionEffect)) 0;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  arg2 = (void(*)(Dali::Toolkit::CubeTransitionEffect))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Disconnect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-  Dali::Toolkit::CubeTransitionEffect arg2;
-  Dali::Toolkit::CubeTransitionEffect *argp2;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  argp2 = (Dali::Toolkit::CubeTransitionEffect *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Toolkit::CubeTransitionEffect", 0);
-    return;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Emit(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CubeTransitionEffectSignal() {
-  void * jresult;
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *result = 0;
-
-  {
-    try {
-      result = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)new Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) >();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionEffectSignal(void * jarg1) {
-  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
-
-  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
-  {
-    try {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-// cube-transition-cross-effect.h
-
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_CubeTransitionCrossEffect_SWIGUpcast(Dali::Toolkit::CubeTransitionCrossEffect *jarg1) {
-  return (Dali::Toolkit::Control *)jarg1;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionCrossEffect_New(unsigned int numRows, unsigned int numColumns) {
-  void * jresult;
-  Dali::Toolkit::CubeTransitionEffect result;
-
-  {
-    try {
-      result = Dali::Toolkit::CubeTransitionCrossEffect::New(numRows, numColumns);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::CubeTransitionCrossEffect((const Dali::Toolkit::CubeTransitionCrossEffect &)result);
-
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionCrossEffect(void * jarg1) {
-  Dali::Toolkit::CubeTransitionCrossEffect *arg1 = (Dali::Toolkit::CubeTransitionCrossEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionCrossEffect *)jarg1;
-  {
-    try {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-// cube-transition-fold-effect.h
-
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_CubeTransitionFoldEffect_SWIGUpcast(Dali::Toolkit::CubeTransitionFoldEffect *jarg1) {
-  return (Dali::Toolkit::Control *)jarg1;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionFoldEffect_New(unsigned int numRows, unsigned int numColumns) {
-  void * jresult;
-  Dali::Toolkit::CubeTransitionEffect result;
-
-  {
-    try {
-      result = Dali::Toolkit::CubeTransitionFoldEffect::New(numRows, numColumns);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::CubeTransitionFoldEffect((const Dali::Toolkit::CubeTransitionFoldEffect &)result);
-
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionFoldEffect(void * jarg1) {
-  Dali::Toolkit::CubeTransitionFoldEffect *arg1 = (Dali::Toolkit::CubeTransitionFoldEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionFoldEffect *)jarg1;
-  {
-    try {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-// cube-transition-wave-effect.h
-
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_CubeTransitionWaveEffect_SWIGUpcast(Dali::Toolkit::CubeTransitionWaveEffect *jarg1) {
-  return (Dali::Toolkit::Control *)jarg1;
-}
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionWaveEffect_New(unsigned int numRows, unsigned int numColumns) {
-  void * jresult;
-  Dali::Toolkit::CubeTransitionEffect result;
-
-  {
-    try {
-      result = Dali::Toolkit::CubeTransitionWaveEffect::New(numRows, numColumns);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::CubeTransitionWaveEffect((const Dali::Toolkit::CubeTransitionWaveEffect &)result);
-
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionWaveEffect(void * jarg1) {
-  Dali::Toolkit::CubeTransitionWaveEffect *arg1 = (Dali::Toolkit::CubeTransitionWaveEffect *) 0;
-
-  arg1 = (Dali::Toolkit::CubeTransitionWaveEffect *)jarg1;
-  {
-    try {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-
-#ifdef __cplusplus
-}
-#endif
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/texture.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h>
+
+// INTERNAL INCLUDES
+#include <dali-csharp-binder/common/common.h>
+
+SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Empty(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *self) {
+  return self->Empty();
+}
+SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__GetConnectionCount(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *self) {
+  return self->GetConnectionCount();
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Connect(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, void(*func)(Dali::Toolkit::CubeTransitionEffect)) {
+  self->Connect(func);
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Disconnect(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, void(*func)(Dali::Toolkit::CubeTransitionEffect)) {
+  self->Disconnect(func);
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Emit(Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *self, Dali::Toolkit::CubeTransitionEffect arg) {
+  self->Emit(arg);
+}
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// cube-transition-effect.h
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CubeTransitionEffect() {
+  Dali::Toolkit::CubeTransitionEffect* result;
+
+  {
+    try {
+      result = new Dali::Toolkit::CubeTransitionEffect();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionEffect(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      delete arg1;
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetTransitionDuration(void * jarg1, float duration) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      (arg1)->SetTransitionDuration(duration);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_GetTransitionDuration(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  float result = 0.0f;
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      result = (arg1)->GetTransitionDuration();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetCubeDisplacement(void * jarg1, float displacement) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      (arg1)->SetCubeDisplacement(displacement);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_GetCubeDisplacement(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  float result = 0.0f;
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      result = (arg1)->GetCubeDisplacement();
+    }
+    CALL_CATCH_EXCEPTION(0.0f);
+  }
+
+  return result;
+}
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_IsTransitioning(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  bool result = false;
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      result = (arg1)->IsTransitioning();
+    }
+    CALL_CATCH_EXCEPTION(false);
+  }
+
+  unsigned int jresult = result; // convert bool to unsigned int.
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetCurrentTexture(void* jarg1, void* jarg2) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  Dali::Texture* argp2 = (Dali::Texture*)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
+    return ;
+  }
+
+  {
+    try {
+      (arg1)->SetCurrentTexture(*argp2);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_SetTargetTexture(void* jarg1, void* jarg2) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  Dali::Texture* argp2 = (Dali::Texture*)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Texture", 0);
+    return;
+  }
+
+  {
+    try {
+      (arg1)->SetTargetTexture(*argp2);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StartTransition__SWIG1(void* jarg1, bool toNextImage) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+
+  {
+    try {
+      (arg1)->StartTransition(toNextImage);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StartTransition__SWIG2(void* jarg1, void* jarg2, void* jarg3) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+
+  Dali::Vector2* argp2 = (Dali::Vector2*)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+    return;
+  }
+
+  Dali::Vector2* argp3 = (Dali::Vector2*)jarg3;
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
+    return;
+  }
+
+  {
+    try {
+      (arg1)->StartTransition(*argp2, *argp3);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_PauseTransition(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      (arg1)->PauseTransition();
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_ResumeTransition(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      (arg1)->ResumeTransition();
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_StopTransition(void * jarg1) {
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      (arg1)->StopTransition();
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionEffect_TransitionCompletedSignal(void * jarg1) {
+  void * jresult;
+  Dali::Toolkit::CubeTransitionEffect *arg1 = (Dali::Toolkit::CubeTransitionEffect *) 0;
+  Dali::Toolkit::CubeTransitionEffect::TransitionCompletedSignalType *result = 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionEffect *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::CubeTransitionEffect::TransitionCompletedSignalType *) &(arg1)->TransitionCompletedSignal();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Empty(void * jarg1) {
+  unsigned int jresult;
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
+  bool result;
+
+  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
+  {
+    try {
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Empty((Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *)arg1);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult;
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
+  std::size_t result;
+
+  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
+  {
+    try {
+      result = Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__GetConnectionCount((Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > const *)arg1);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (unsigned long)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
+  void(*arg2)(Dali::Toolkit::CubeTransitionEffect) = (void(*)(Dali::Toolkit::CubeTransitionEffect)) 0;
+
+  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
+  arg2 = (void(*)(Dali::Toolkit::CubeTransitionEffect))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Connect(arg1, arg2);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CubeTransitionEffectSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
+  void(*arg2)(Dali::Toolkit::CubeTransitionEffect) = (void(*)(Dali::Toolkit::CubeTransitionEffect)) 0;
+
+  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
+  arg2 = (void(*)(Dali::Toolkit::CubeTransitionEffect))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Toolkit_CubeTransitionEffect_SP__Sg__Disconnect(arg1, arg2);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CubeTransitionEffectSignal() {
+  void * jresult;
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *result = 0;
+
+  {
+    try {
+      result = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)new Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) >();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionEffectSignal(void * jarg1) {
+  Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *) 0;
+
+  arg1 = (Dali::Signal< void(Dali::Toolkit::CubeTransitionEffect) > *)jarg1;
+  {
+    try {
+      delete arg1;
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+// cube-transition-cross-effect.h
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionCrossEffect_New(unsigned int numRows, unsigned int numColumns) {
+  void * jresult;
+  Dali::Toolkit::CubeTransitionEffect result;
+
+  {
+    try {
+      result = Dali::Toolkit::CubeTransitionCrossEffect::New(numRows, numColumns);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Toolkit::CubeTransitionCrossEffect((const Dali::Toolkit::CubeTransitionCrossEffect &)result);
+
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionCrossEffect(void * jarg1) {
+  Dali::Toolkit::CubeTransitionCrossEffect *arg1 = (Dali::Toolkit::CubeTransitionCrossEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionCrossEffect *)jarg1;
+  {
+    try {
+      delete arg1;
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+// cube-transition-fold-effect.h
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionFoldEffect_New(unsigned int numRows, unsigned int numColumns) {
+  void * jresult;
+  Dali::Toolkit::CubeTransitionEffect result;
+
+  {
+    try {
+      result = Dali::Toolkit::CubeTransitionFoldEffect::New(numRows, numColumns);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Toolkit::CubeTransitionFoldEffect((const Dali::Toolkit::CubeTransitionFoldEffect &)result);
+
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionFoldEffect(void * jarg1) {
+  Dali::Toolkit::CubeTransitionFoldEffect *arg1 = (Dali::Toolkit::CubeTransitionFoldEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionFoldEffect *)jarg1;
+  {
+    try {
+      delete arg1;
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+// cube-transition-wave-effect.h
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CubeTransitionWaveEffect_New(unsigned int numRows, unsigned int numColumns) {
+  void * jresult;
+  Dali::Toolkit::CubeTransitionEffect result;
+
+  {
+    try {
+      result = Dali::Toolkit::CubeTransitionWaveEffect::New(numRows, numColumns);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Toolkit::CubeTransitionWaveEffect((const Dali::Toolkit::CubeTransitionWaveEffect &)result);
+
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CubeTransitionWaveEffect(void * jarg1) {
+  Dali::Toolkit::CubeTransitionWaveEffect *arg1 = (Dali::Toolkit::CubeTransitionWaveEffect *) 0;
+
+  arg1 = (Dali::Toolkit::CubeTransitionWaveEffect *)jarg1;
+  {
+    try {
+      delete arg1;
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/dali-csharp-binder/dali-toolkit/transition-set-wrap.cpp b/dali-csharp-binder/dali-toolkit/transition-set-wrap.cpp
index 682d78bc..94fa781b 100755
--- a/dali-csharp-binder/dali-toolkit/transition-set-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/transition-set-wrap.cpp
@@ -46,21 +46,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_TransitionSet()
-  {
-    void *jresult;
-    Dali::Toolkit::TransitionSet *result = 0;
-    {
-      try
-      {
-        result = (Dali::Toolkit::TransitionSet *)new Dali::Toolkit::TransitionSet();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_TransitionSet_New()
   {
diff --git a/dali-csharp-binder/dali-toolkit/transition-wrap.cpp b/dali-csharp-binder/dali-toolkit/transition-wrap.cpp
index 47e984b5..f9553aeb 100755
--- a/dali-csharp-binder/dali-toolkit/transition-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/transition-wrap.cpp
@@ -26,22 +26,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_Transition()
-  {
-    void *jresult;
-    Dali::Toolkit::Transition *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::Toolkit::Transition *)new Dali::Toolkit::Transition();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Transition_New(void *nuiSource, void *nuiDestination, bool useDestinationTarget, void *nuiTimePeriod)
   {
diff --git a/dali-csharp-binder/widget-viewer-dali/widget-view-manager-wrap.cpp b/dali-csharp-binder/widget-viewer-dali/widget-view-manager-wrap.cpp
index 647692cc..efc20f44 100755
--- a/dali-csharp-binder/widget-viewer-dali/widget-view-manager-wrap.cpp
+++ b/dali-csharp-binder/widget-viewer-dali/widget-view-manager-wrap.cpp
@@ -27,10 +27,6 @@ extern "C"
 {
 #endif
 
-  SWIGEXPORT Dali::BaseHandle *SWIGSTDCALL CSharp_Dali_WidgetViewManager_SWIGUpcast(Dali::WidgetView::WidgetViewManager *jarg1)
-  {
-    return (Dali::BaseHandle *)jarg1;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_WidgetViewManager_New(void *jarg1, char *jarg2)
   {
@@ -95,22 +91,6 @@ extern "C"
     return jresult;
   }
 
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_WidgetViewManager__SWIG_0()
-  {
-    void *jresult;
-    Dali::WidgetView::WidgetViewManager *result = 0;
-
-    {
-      try
-      {
-        result = (Dali::WidgetView::WidgetViewManager *)new Dali::WidgetView::WidgetViewManager();
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
 
   SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_WidgetViewManager__SWIG_1(void *jarg1)
   {
diff --git a/dali-csharp-binder/widget-viewer-dali/widget-view-wrap.cpp b/dali-csharp-binder/widget-viewer-dali/widget-view-wrap.cpp
index b9311682..4e1dcd3c 100755
--- a/dali-csharp-binder/widget-viewer-dali/widget-view-wrap.cpp
+++ b/dali-csharp-binder/widget-viewer-dali/widget-view-wrap.cpp
@@ -41,9 +41,6 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_WidgetView_WidgetView_SP__Sg__Emit(D
 extern "C" {
 #endif
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_WidgetView_SWIGUpcast(Dali::WidgetView::WidgetView *jarg1) {
-    return (Dali::Toolkit::Control *)jarg1;
-}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WidgetView_Property_WIDGET_ID_get() {
   int jresult ;
@@ -161,32 +158,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WidgetView_Property_KEEP_WIDGET_SIZE_get(
   return jresult;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WidgetView_Property() {
-  void * jresult ;
-  Dali::WidgetView::WidgetView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::WidgetView::WidgetView::Property *)new Dali::WidgetView::WidgetView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
 
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WidgetView_Property(void * jarg1) {
-  Dali::WidgetView::WidgetView::Property *arg1 = (Dali::WidgetView::WidgetView::Property *) 0 ;
-
-  arg1 = (Dali::WidgetView::WidgetView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
 
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WidgetView_New(char * jarg1, char * jarg2, int jarg3, int jarg4, float jarg5) {
@@ -253,19 +226,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WidgetView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WidgetView__SWIG_0() {
-  void * jresult ;
-  Dali::WidgetView::WidgetView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::WidgetView::WidgetView *)new Dali::WidgetView::WidgetView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WidgetView__SWIG_1(void * jarg1) {