diff --git a/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.cpp b/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.cpp
index 0e4addf45a..dff00651be 100644
--- a/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.cpp
+++ b/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.cpp
@@ -746,7 +746,7 @@ namespace Swig {
 namespace Swig {
   namespace {
     jclass jclass_AdaptiveCardObjectModelJNI = NULL;
-    jmethodID director_method_ids[33];
+    jmethodID director_method_ids[25];
   }
 }
 
@@ -1721,39 +1721,29 @@ SwigDirector_BaseElement::~SwigDirector_BaseElement() {
 }
 
 
-std::string SwigDirector_BaseElement::GetId() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
+void SwigDirector_BaseElement::SetId(std::string &&value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
+  jlong jvalue  ;
   
   if (!swig_override[0]) {
-    return AdaptiveCards::BaseElement::GetId();
+    AdaptiveCards::BaseElement::SetId(value);
+    return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[0], swigjobj);
+    *(std::string **)&jvalue = (std::string *) &value; 
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[0], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
     }
     
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
   } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseElement::GetId ");
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseElement::SetId ");
   }
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
 }
 
 void SwigDirector_BaseElement::SetId(std::string const &value) {
@@ -1881,7 +1871,7 @@ void SwigDirector_BaseElement::swig_connect_director(JNIEnv *jenv, jobject jself
     jmethodID base_methid;
   } methods[] = {
     {
-      "GetId", "()Ljava/lang/String;", NULL 
+      "SetId", "(Lio/adaptivecards/objectmodel/SWIGTYPE_p_std__string;)V", NULL 
     },
     {
       "SetId", "(Ljava/lang/String;)V", NULL 
@@ -1937,39 +1927,29 @@ SwigDirector_BaseCardElement::~SwigDirector_BaseCardElement() {
 }
 
 
-std::string SwigDirector_BaseCardElement::GetId() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
+void SwigDirector_BaseCardElement::SetId(std::string &&value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
+  jlong jvalue  ;
   
   if (!swig_override[0]) {
-    return AdaptiveCards::BaseElement::GetId();
+    AdaptiveCards::BaseElement::SetId(value);
+    return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[5], swigjobj);
+    *(std::string **)&jvalue = (std::string *) &value; 
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[5], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
     }
     
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
   } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseCardElement::GetId ");
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseCardElement::SetId ");
   }
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
 }
 
 void SwigDirector_BaseCardElement::SetId(std::string const &value) {
@@ -2116,7 +2096,7 @@ bool SwigDirector_BaseCardElement::GetSeparator() const {
   return c_result;
 }
 
-void SwigDirector_BaseCardElement::SetSeparator(bool const value) {
+void SwigDirector_BaseCardElement::SetSeparator(bool value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
@@ -2167,7 +2147,7 @@ AdaptiveCards::Spacing SwigDirector_BaseCardElement::GetSpacing() const {
   return c_result;
 }
 
-void SwigDirector_BaseCardElement::SetSpacing(AdaptiveCards::Spacing const value) {
+void SwigDirector_BaseCardElement::SetSpacing(AdaptiveCards::Spacing value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
@@ -2192,83 +2172,6 @@ void SwigDirector_BaseCardElement::SetSpacing(AdaptiveCards::Spacing const value
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-bool SwigDirector_BaseCardElement::GetIsVisible() const {
-  bool c_result = SwigValueInit< bool >() ;
-  jboolean jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[9]) {
-    return AdaptiveCards::BaseCardElement::GetIsVisible();
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jboolean) jenv->CallStaticBooleanMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[14], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-    c_result = jresult ? true : false; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseCardElement::GetIsVisible ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-void SwigDirector_BaseCardElement::SetIsVisible(bool const value) {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jboolean jvalue  ;
-  
-  if (!swig_override[10]) {
-    AdaptiveCards::BaseCardElement::SetIsVisible(value);
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jvalue = (jboolean) value;
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[15], swigjobj, jvalue);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseCardElement::SetIsVisible ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-AdaptiveCards::CardElementType SwigDirector_BaseCardElement::GetElementType() const {
-  AdaptiveCards::CardElementType c_result = SwigValueInit< AdaptiveCards::CardElementType >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[11]) {
-    return AdaptiveCards::BaseCardElement::GetElementType();
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[16], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-    c_result = (AdaptiveCards::CardElementType)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseCardElement::GetElementType ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
 void SwigDirector_BaseCardElement::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {
   static struct {
     const char *mname;
@@ -2276,7 +2179,7 @@ void SwigDirector_BaseCardElement::swig_connect_director(JNIEnv *jenv, jobject j
     jmethodID base_methid;
   } methods[] = {
     {
-      "GetId", "()Ljava/lang/String;", NULL 
+      "SetId", "(Lio/adaptivecards/objectmodel/SWIGTYPE_p_std__string;)V", NULL 
     },
     {
       "SetId", "(Ljava/lang/String;)V", NULL 
@@ -2301,15 +2204,6 @@ void SwigDirector_BaseCardElement::swig_connect_director(JNIEnv *jenv, jobject j
     },
     {
       "SetSpacing", "(Lio/adaptivecards/objectmodel/Spacing;)V", NULL 
-    },
-    {
-      "GetIsVisible", "()Z", NULL 
-    },
-    {
-      "SetIsVisible", "(Z)V", NULL 
-    },
-    {
-      "GetElementType", "()Lio/adaptivecards/objectmodel/CardElementType;", NULL 
     }
   };
   
@@ -2322,7 +2216,7 @@ void SwigDirector_BaseCardElement::swig_connect_director(JNIEnv *jenv, jobject j
       baseclass = (jclass) jenv->NewGlobalRef(baseclass);
     }
     bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
-    for (int i = 0; i < 12; ++i) {
+    for (int i = 0; i < 9; ++i) {
       if (!methods[i].base_methid) {
         methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);
         if (!methods[i].base_methid) return;
@@ -2355,39 +2249,29 @@ SwigDirector_BaseActionElement::~SwigDirector_BaseActionElement() {
 }
 
 
-std::string SwigDirector_BaseActionElement::GetId() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
+void SwigDirector_BaseActionElement::SetId(std::string &&value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
+  jlong jvalue  ;
   
   if (!swig_override[0]) {
-    return AdaptiveCards::BaseElement::GetId();
+    AdaptiveCards::BaseElement::SetId(value);
+    return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[17], swigjobj);
+    *(std::string **)&jvalue = (std::string *) &value; 
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[14], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
     }
     
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
   } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::GetId ");
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::SetId ");
   }
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
 }
 
 void SwigDirector_BaseActionElement::SetId(std::string const &value) {
@@ -2404,7 +2288,7 @@ void SwigDirector_BaseActionElement::SetId(std::string const &value) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jvalue = jenv->NewStringUTF((&value)->c_str());
     Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[18], swigjobj, jvalue);
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[15], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2428,7 +2312,7 @@ std::string SwigDirector_BaseActionElement::Serialize() const {
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[19], swigjobj);
+    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[16], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2464,7 +2348,7 @@ Json::Value SwigDirector_BaseActionElement::SerializeToJsonValue() const {
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[20], swigjobj);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[17], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2496,7 +2380,7 @@ void SwigDirector_BaseActionElement::GetResourceInformation(std::vector< Adaptiv
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *(std::vector< AdaptiveCards::RemoteResourceInformation > **)&jresourceUris = (std::vector< AdaptiveCards::RemoteResourceInformation > *) &resourceUris; 
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[21], swigjobj, jresourceUris);
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[18], swigjobj, jresourceUris);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2508,39 +2392,29 @@ void SwigDirector_BaseActionElement::GetResourceInformation(std::vector< Adaptiv
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-std::string SwigDirector_BaseActionElement::GetTitle() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
+void SwigDirector_BaseActionElement::SetTitle(std::string &&value) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
+  jlong jvalue  ;
   
   if (!swig_override[5]) {
-    return AdaptiveCards::BaseActionElement::GetTitle();
+    AdaptiveCards::BaseActionElement::SetTitle(value);
+    return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[22], swigjobj);
+    *(std::string **)&jvalue = (std::string *) &value; 
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[19], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
     }
     
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
   } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::GetTitle ");
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::SetTitle ");
   }
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
 }
 
 void SwigDirector_BaseActionElement::SetTitle(std::string const &value) {
@@ -2557,7 +2431,7 @@ void SwigDirector_BaseActionElement::SetTitle(std::string const &value) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jvalue = jenv->NewStringUTF((&value)->c_str());
     Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[23], swigjobj, jvalue);
+    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[20], swigjobj, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2569,154 +2443,6 @@ void SwigDirector_BaseActionElement::SetTitle(std::string const &value) {
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-std::string SwigDirector_BaseActionElement::GetIconUrl() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[7]) {
-    return AdaptiveCards::BaseActionElement::GetIconUrl();
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[24], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::GetIconUrl ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-void SwigDirector_BaseActionElement::SetIconUrl(std::string const &value) {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jvalue = 0 ;
-  
-  if (!swig_override[8]) {
-    AdaptiveCards::BaseActionElement::SetIconUrl(value);
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jvalue = jenv->NewStringUTF((&value)->c_str());
-    Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[25], swigjobj, jvalue);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::SetIconUrl ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-std::string SwigDirector_BaseActionElement::GetStyle() const {
-  std::string c_result ;
-  jstring jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[9]) {
-    return AdaptiveCards::BaseActionElement::GetStyle();
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jstring) jenv->CallStaticObjectMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[26], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-    if(!jresult) {
-      if (!jenv->ExceptionCheck()) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-      }
-      return c_result;
-    } 
-    const char *c_result_pstr = (const char *)jenv->GetStringUTFChars(jresult, 0); 
-    if (!c_result_pstr) return c_result;
-    c_result.assign(c_result_pstr);
-    jenv->ReleaseStringUTFChars(jresult, c_result_pstr); 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::GetStyle ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-void SwigDirector_BaseActionElement::SetStyle(std::string const &value) {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jvalue = 0 ;
-  
-  if (!swig_override[10]) {
-    AdaptiveCards::BaseActionElement::SetStyle(value);
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jvalue = jenv->NewStringUTF((&value)->c_str());
-    Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jenv->CallStaticVoidMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[27], swigjobj, jvalue);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::SetStyle ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-AdaptiveCards::ActionType SwigDirector_BaseActionElement::GetElementType() const {
-  AdaptiveCards::ActionType c_result = SwigValueInit< AdaptiveCards::ActionType >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[11]) {
-    return AdaptiveCards::BaseActionElement::GetElementType();
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[28], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-    c_result = (AdaptiveCards::ActionType)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in AdaptiveCards::BaseActionElement::GetElementType ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
 void SwigDirector_BaseActionElement::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {
   static struct {
     const char *mname;
@@ -2724,7 +2450,7 @@ void SwigDirector_BaseActionElement::swig_connect_director(JNIEnv *jenv, jobject
     jmethodID base_methid;
   } methods[] = {
     {
-      "GetId", "()Ljava/lang/String;", NULL 
+      "SetId", "(Lio/adaptivecards/objectmodel/SWIGTYPE_p_std__string;)V", NULL 
     },
     {
       "SetId", "(Ljava/lang/String;)V", NULL 
@@ -2739,25 +2465,10 @@ void SwigDirector_BaseActionElement::swig_connect_director(JNIEnv *jenv, jobject
       "GetResourceInformation", "(Lio/adaptivecards/objectmodel/RemoteResourceInformationVector;)V", NULL 
     },
     {
-      "GetTitle", "()Ljava/lang/String;", NULL 
+      "SetTitle", "(Lio/adaptivecards/objectmodel/SWIGTYPE_p_std__string;)V", NULL 
     },
     {
       "SetTitle", "(Ljava/lang/String;)V", NULL 
-    },
-    {
-      "GetIconUrl", "()Ljava/lang/String;", NULL 
-    },
-    {
-      "SetIconUrl", "(Ljava/lang/String;)V", NULL 
-    },
-    {
-      "GetStyle", "()Ljava/lang/String;", NULL 
-    },
-    {
-      "SetStyle", "(Ljava/lang/String;)V", NULL 
-    },
-    {
-      "GetElementType", "()Lio/adaptivecards/objectmodel/ActionType;", NULL 
     }
   };
   
@@ -2770,7 +2481,7 @@ void SwigDirector_BaseActionElement::swig_connect_director(JNIEnv *jenv, jobject
       baseclass = (jclass) jenv->NewGlobalRef(baseclass);
     }
     bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
-    for (int i = 0; i < 12; ++i) {
+    for (int i = 0; i < 7; ++i) {
       if (!methods[i].base_methid) {
         methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);
         if (!methods[i].base_methid) return;
@@ -2807,7 +2518,7 @@ std::shared_ptr< AdaptiveCards::BaseActionElement > SwigDirector_ActionElementPa
     jcontext = 0;
     *((std::shared_ptr<  AdaptiveCards::ParseContext > **)&jcontext) = new std::shared_ptr<  AdaptiveCards::ParseContext > (&context SWIG_NO_NULL_DELETER_0); 
     *(Json::Value **)&jvalue = (Json::Value *) &value; 
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[29], swigjobj, jcontext, jvalue);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[21], swigjobj, jcontext, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2848,7 +2559,7 @@ std::shared_ptr< AdaptiveCards::BaseActionElement > SwigDirector_ActionElementPa
     *((std::shared_ptr<  AdaptiveCards::ParseContext > **)&jcontext) = new std::shared_ptr<  AdaptiveCards::ParseContext > (&context SWIG_NO_NULL_DELETER_0); 
     jvalue = jenv->NewStringUTF((&value)->c_str());
     Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[30], swigjobj, jcontext, jvalue);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[22], swigjobj, jcontext, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2925,7 +2636,7 @@ std::shared_ptr< AdaptiveCards::BaseCardElement > SwigDirector_BaseCardElementPa
     jcontext = 0;
     *((std::shared_ptr<  AdaptiveCards::ParseContext > **)&jcontext) = new std::shared_ptr<  AdaptiveCards::ParseContext > (&context SWIG_NO_NULL_DELETER_0); 
     *(Json::Value **)&jvalue = (Json::Value *) &value; 
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[31], swigjobj, jcontext, jvalue);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[23], swigjobj, jcontext, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -2966,7 +2677,7 @@ std::shared_ptr< AdaptiveCards::BaseCardElement > SwigDirector_BaseCardElementPa
     *((std::shared_ptr<  AdaptiveCards::ParseContext > **)&jcontext) = new std::shared_ptr<  AdaptiveCards::ParseContext > (&context SWIG_NO_NULL_DELETER_0); 
     jvalue = jenv->NewStringUTF((&value)->c_str());
     Swig::LocalRefGuard value_refguard(jenv, jvalue); 
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[32], swigjobj, jcontext, jvalue);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_AdaptiveCardObjectModelJNI, Swig::director_method_ids[24], swigjobj, jcontext, jvalue);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -7266,13 +6977,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_AdaptiveCardSchemaKeyToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::AdaptiveCardSchemaKey arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::AdaptiveCardSchemaKey)jarg1; 
-  result = AdaptiveCards::AdaptiveCardSchemaKeyToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::AdaptiveCardSchemaKeyToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7314,13 +7025,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_CardElementTypeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::CardElementType arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::CardElementType)jarg1; 
-  result = AdaptiveCards::CardElementTypeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::CardElementTypeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7362,13 +7073,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_InlineElementTypeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::InlineElementType arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::InlineElementType)jarg1; 
-  result = AdaptiveCards::InlineElementTypeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::InlineElementTypeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7410,13 +7121,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_TextSizeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::TextSize arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::TextSize)jarg1; 
-  result = AdaptiveCards::TextSizeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::TextSizeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7458,13 +7169,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_TextWeightToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::TextWeight arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::TextWeight)jarg1; 
-  result = AdaptiveCards::TextWeightToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::TextWeightToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7506,13 +7217,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_FontTypeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::FontType arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::FontType)jarg1; 
-  result = AdaptiveCards::FontTypeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::FontTypeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7554,13 +7265,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ForegroundColorToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ForegroundColor arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ForegroundColor)jarg1; 
-  result = AdaptiveCards::ForegroundColorToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ForegroundColorToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7602,13 +7313,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_HorizontalAlignmentToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::HorizontalAlignment arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::HorizontalAlignment)jarg1; 
-  result = AdaptiveCards::HorizontalAlignmentToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::HorizontalAlignmentToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7650,13 +7361,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_VerticalAlignmentToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::VerticalAlignment arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::VerticalAlignment)jarg1; 
-  result = AdaptiveCards::VerticalAlignmentToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::VerticalAlignmentToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7698,13 +7409,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ImageFillModeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ImageFillMode arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ImageFillMode)jarg1; 
-  result = AdaptiveCards::ImageFillModeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ImageFillModeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7746,13 +7457,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ImageStyleToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ImageStyle arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ImageStyle)jarg1; 
-  result = AdaptiveCards::ImageStyleToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ImageStyleToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7794,13 +7505,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ImageSizeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ImageSize arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ImageSize)jarg1; 
-  result = AdaptiveCards::ImageSizeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ImageSizeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7842,13 +7553,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_TextInputStyleToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::TextInputStyle arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::TextInputStyle)jarg1; 
-  result = AdaptiveCards::TextInputStyleToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::TextInputStyleToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7890,13 +7601,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ActionTypeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ActionType arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ActionType)jarg1; 
-  result = AdaptiveCards::ActionTypeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ActionTypeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7938,13 +7649,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ActionAlignmentToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ActionAlignment arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ActionAlignment)jarg1; 
-  result = AdaptiveCards::ActionAlignmentToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ActionAlignmentToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -7986,13 +7697,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ChoiceSetStyleToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ChoiceSetStyle arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ChoiceSetStyle)jarg1; 
-  result = AdaptiveCards::ChoiceSetStyleToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ChoiceSetStyleToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8034,13 +7745,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_SeparatorThicknessToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::SeparatorThickness arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::SeparatorThickness)jarg1; 
-  result = AdaptiveCards::SeparatorThicknessToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::SeparatorThicknessToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8082,13 +7793,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_SpacingToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::Spacing arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::Spacing)jarg1; 
-  result = AdaptiveCards::SpacingToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::SpacingToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8130,13 +7841,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ActionsOrientationToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ActionsOrientation arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ActionsOrientation)jarg1; 
-  result = AdaptiveCards::ActionsOrientationToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ActionsOrientationToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8178,13 +7889,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ActionModeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ActionMode arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ActionMode)jarg1; 
-  result = AdaptiveCards::ActionModeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ActionModeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8226,13 +7937,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_ContainerStyleToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::ContainerStyle arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::ContainerStyle)jarg1; 
-  result = AdaptiveCards::ContainerStyleToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::ContainerStyleToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8274,13 +7985,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_IconPlacementToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::IconPlacement arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::IconPlacement)jarg1; 
-  result = AdaptiveCards::IconPlacementToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::IconPlacementToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8322,13 +8033,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_VerticalContentAlignmentToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::VerticalContentAlignment arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::VerticalContentAlignment)jarg1; 
-  result = AdaptiveCards::VerticalContentAlignmentToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::VerticalContentAlignmentToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8370,13 +8081,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_HeightTypeToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::HeightType arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::HeightType)jarg1; 
-  result = AdaptiveCards::HeightTypeToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::HeightTypeToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8418,13 +8129,13 @@ SWIGEXPORT jlong JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMod
 SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_InputNecessityIndicatorsToString(JNIEnv *jenv, jclass jcls, jint jarg1) {
   jstring jresult = 0 ;
   AdaptiveCards::InputNecessityIndicators arg1 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = (AdaptiveCards::InputNecessityIndicators)jarg1; 
-  result = AdaptiveCards::InputNecessityIndicatorsToString(arg1);
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &AdaptiveCards::InputNecessityIndicatorsToString(arg1);
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -8783,7 +8494,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
   std::shared_ptr< AdaptiveCards::BaseElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -8791,13 +8502,33 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseElement const *)arg1)->GetElementTypeString();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::BaseElement const *)arg1)->GetElementTypeString();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetElementTypeString(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetElementTypeString_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
+  std::string *arg2 = 0 ;
+  std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseElement > **)&jarg1;
+  arg1 = (AdaptiveCards::BaseElement *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
+    return ;
+  } 
+  (arg1)->SetElementTypeString((std::string &&)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetElementTypeString_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
@@ -8825,7 +8556,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
   std::shared_ptr< AdaptiveCards::BaseElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -8833,31 +8564,53 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseElement const *)arg1)->GetId();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::BaseElement const *)arg1)->GetId();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
 
-SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1GetIdSwigExplicitBaseElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetId_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *arg2 = 0 ;
+  std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
   
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseElement > **)&jarg1;
+  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseElement const *)arg1)->AdaptiveCards::BaseElement::GetId();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
-  return jresult;
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
+    return ;
+  } 
+  (arg1)->SetId((std::string &&)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetIdSwigExplicitBaseElement_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
+  std::string *arg2 = 0 ;
+  std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseElement > **)&jarg1;
+  arg1 = (AdaptiveCards::BaseElement *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
+    return ;
+  } 
+  (arg1)->AdaptiveCards::BaseElement::SetId((std::string &&)*arg2);
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetId(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetId_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
@@ -8881,7 +8634,7 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetIdSwigExplicitBaseElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseElement_1SetIdSwigExplicitBaseElement_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseElement *arg1 = (AdaptiveCards::BaseElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseElement > *smartarg1 = 0 ;
@@ -9570,24 +9323,6 @@ SWIGEXPORT jboolean JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObject
 }
 
 
-SWIGEXPORT jboolean JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1GetIsVisibleSwigExplicitBaseCardElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jboolean jresult = 0 ;
-  AdaptiveCards::BaseCardElement *arg1 = (AdaptiveCards::BaseCardElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseCardElement const > *smartarg1 = 0 ;
-  bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseCardElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseCardElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = (bool)((AdaptiveCards::BaseCardElement const *)arg1)->AdaptiveCards::BaseCardElement::GetIsVisible();
-  jresult = (jboolean)result; 
-  return jresult;
-}
-
-
 SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1SetIsVisible(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) {
   AdaptiveCards::BaseCardElement *arg1 = (AdaptiveCards::BaseCardElement *) 0 ;
   bool arg2 ;
@@ -9604,22 +9339,6 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1SetIsVisibleSwigExplicitBaseCardElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) {
-  AdaptiveCards::BaseCardElement *arg1 = (AdaptiveCards::BaseCardElement *) 0 ;
-  bool arg2 ;
-  std::shared_ptr< AdaptiveCards::BaseCardElement > *smartarg1 = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseCardElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseCardElement *)(smartarg1 ? smartarg1->get() : 0); 
-  arg2 = jarg2 ? true : false; 
-  (arg1)->AdaptiveCards::BaseCardElement::SetIsVisible(arg2);
-}
-
-
 SWIGEXPORT jint JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1GetElementType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jint jresult = 0 ;
   AdaptiveCards::BaseCardElement *arg1 = (AdaptiveCards::BaseCardElement *) 0 ;
@@ -9638,24 +9357,6 @@ SWIGEXPORT jint JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
 }
 
 
-SWIGEXPORT jint JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1GetElementTypeSwigExplicitBaseCardElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  AdaptiveCards::BaseCardElement *arg1 = (AdaptiveCards::BaseCardElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseCardElement const > *smartarg1 = 0 ;
-  AdaptiveCards::CardElementType result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseCardElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseCardElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = (AdaptiveCards::CardElementType)((AdaptiveCards::BaseCardElement const *)arg1)->AdaptiveCards::BaseCardElement::GetElementType();
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
 SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseCardElement_1ParseJsonObject(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
   AdaptiveCards::ParseContext *arg1 = 0 ;
   Json::Value *arg2 = 0 ;
@@ -9822,7 +9523,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -9830,31 +9531,53 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->GetTitle();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::BaseActionElement const *)arg1)->GetTitle();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
 
-SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1GetTitleSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitle_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *arg2 = 0 ;
+  std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
   
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
+  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->AdaptiveCards::BaseActionElement::GetTitle();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
-  return jresult;
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
+    return ;
+  } 
+  (arg1)->SetTitle((std::string &&)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitleSwigExplicitBaseActionElement_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
+  std::string *arg2 = 0 ;
+  std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseActionElement > **)&jarg1;
+  arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
+    return ;
+  } 
+  (arg1)->AdaptiveCards::BaseActionElement::SetTitle((std::string &&)*arg2);
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitle(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitle_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -9878,7 +9601,7 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitleSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetTitleSwigExplicitBaseActionElement_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -9906,25 +9629,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->GetIconUrl();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1GetIconUrlSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -9932,13 +9637,13 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->AdaptiveCards::BaseActionElement::GetIconUrl();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::BaseActionElement const *)arg1)->GetIconUrl();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetIconUrl(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetIconUrl_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -9949,20 +9654,16 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
   
   smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  if(!jarg2) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
     return ;
-  }
-  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
-  if (!arg2_pstr) return ;
-  std::string arg2_str(arg2_pstr);
-  arg2 = &arg2_str;
-  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
-  (arg1)->SetIconUrl((std::string const &)*arg2);
+  } 
+  (arg1)->SetIconUrl((std::string &&)*arg2);
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetIconUrlSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetIconUrl_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -9982,7 +9683,7 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
   std::string arg2_str(arg2_pstr);
   arg2 = &arg2_str;
   jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
-  (arg1)->AdaptiveCards::BaseActionElement::SetIconUrl((std::string const &)*arg2);
+  (arg1)->SetIconUrl((std::string const &)*arg2);
 }
 
 
@@ -9990,25 +9691,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->GetStyle();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1GetStyleSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -10016,13 +9699,13 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::BaseActionElement const *)arg1)->AdaptiveCards::BaseActionElement::GetStyle();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::BaseActionElement const *)arg1)->GetStyle();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetStyle(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetStyle_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -10033,20 +9716,16 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
   
   smartarg1 = *(std::shared_ptr<  AdaptiveCards::BaseActionElement > **)&jarg1;
   arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  if(!jarg2) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+  arg2 = *(std::string **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::string && reference is null");
     return ;
-  }
-  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
-  if (!arg2_pstr) return ;
-  std::string arg2_str(arg2_pstr);
-  arg2 = &arg2_str;
-  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
-  (arg1)->SetStyle((std::string const &)*arg2);
+  } 
+  (arg1)->SetStyle((std::string &&)*arg2);
 }
 
 
-SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetStyleSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1SetStyle_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::string *arg2 = 0 ;
   std::shared_ptr< AdaptiveCards::BaseActionElement > *smartarg1 = 0 ;
@@ -10066,7 +9745,7 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
   std::string arg2_str(arg2_pstr);
   arg2 = &arg2_str;
   jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
-  (arg1)->AdaptiveCards::BaseActionElement::SetStyle((std::string const &)*arg2);
+  (arg1)->SetStyle((std::string const &)*arg2);
 }
 
 
@@ -10088,24 +9767,6 @@ SWIGEXPORT jint JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
 }
 
 
-SWIGEXPORT jint JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1GetElementTypeSwigExplicitBaseActionElement(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
-  std::shared_ptr< AdaptiveCards::BaseActionElement const > *smartarg1 = 0 ;
-  AdaptiveCards::ActionType result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  
-  smartarg1 = *(std::shared_ptr< const AdaptiveCards::BaseActionElement > **)&jarg1;
-  arg1 = (AdaptiveCards::BaseActionElement *)(smartarg1 ? smartarg1->get() : 0); 
-  result = (AdaptiveCards::ActionType)((AdaptiveCards::BaseActionElement const *)arg1)->AdaptiveCards::BaseActionElement::GetElementType();
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
 SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectModelJNI_BaseActionElement_1GetResourceInformation(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
   AdaptiveCards::BaseActionElement *arg1 = (AdaptiveCards::BaseActionElement *) 0 ;
   std::vector< AdaptiveCards::RemoteResourceInformation > *arg2 = 0 ;
@@ -17856,7 +17517,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::ParseContext *arg1 = (AdaptiveCards::ParseContext *) 0 ;
   std::shared_ptr< AdaptiveCards::ParseContext const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -17864,8 +17525,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::ParseContext > **)&jarg1;
   arg1 = (AdaptiveCards::ParseContext *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::ParseContext const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::ParseContext const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -18625,7 +18286,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::AdaptiveCard *arg1 = (AdaptiveCards::AdaptiveCard *) 0 ;
   std::shared_ptr< AdaptiveCards::AdaptiveCard const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -18633,8 +18294,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::AdaptiveCard > **)&jarg1;
   arg1 = (AdaptiveCards::AdaptiveCard *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::AdaptiveCard const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::AdaptiveCard const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -24439,7 +24100,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::Fact *arg1 = (AdaptiveCards::Fact *) 0 ;
   std::shared_ptr< AdaptiveCards::Fact const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -24447,8 +24108,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::Fact > **)&jarg1;
   arg1 = (AdaptiveCards::Fact *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::Fact const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::Fact const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -25181,7 +24842,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::TextBlock *arg1 = (AdaptiveCards::TextBlock *) 0 ;
   std::shared_ptr< AdaptiveCards::TextBlock const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -25189,8 +24850,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::TextBlock > **)&jarg1;
   arg1 = (AdaptiveCards::TextBlock *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::TextBlock const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::TextBlock const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -27281,7 +26942,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::TextElementProperties *arg1 = (AdaptiveCards::TextElementProperties *) 0 ;
   std::shared_ptr< AdaptiveCards::TextElementProperties const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -27289,8 +26950,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::TextElementProperties > **)&jarg1;
   arg1 = (AdaptiveCards::TextElementProperties *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::TextElementProperties const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::TextElementProperties const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -28248,7 +27909,7 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   jstring jresult = 0 ;
   AdaptiveCards::TextRun *arg1 = (AdaptiveCards::TextRun *) 0 ;
   std::shared_ptr< AdaptiveCards::TextRun const > *smartarg1 = 0 ;
-  std::string result;
+  std::string *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -28256,8 +27917,8 @@ SWIGEXPORT jstring JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectM
   
   smartarg1 = *(std::shared_ptr< const AdaptiveCards::TextRun > **)&jarg1;
   arg1 = (AdaptiveCards::TextRun *)(smartarg1 ? smartarg1->get() : 0); 
-  result = ((AdaptiveCards::TextRun const *)arg1)->GetLanguage();
-  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  result = (std::string *) &((AdaptiveCards::TextRun const *)arg1)->GetLanguage();
+  jresult = jenv->NewStringUTF(result->c_str()); 
   return jresult;
 }
 
@@ -29153,12 +28814,12 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
   static struct {
     const char *method;
     const char *signature;
-  } methods[33] = {
+  } methods[25] = {
     {
-      "SwigDirector_BaseElement_GetId", "(Lio/adaptivecards/objectmodel/BaseElement;)Ljava/lang/String;" 
+      "SwigDirector_BaseElement_SetId__SWIG_0", "(Lio/adaptivecards/objectmodel/BaseElement;J)V" 
     },
     {
-      "SwigDirector_BaseElement_SetId", "(Lio/adaptivecards/objectmodel/BaseElement;Ljava/lang/String;)V" 
+      "SwigDirector_BaseElement_SetId__SWIG_1", "(Lio/adaptivecards/objectmodel/BaseElement;Ljava/lang/String;)V" 
     },
     {
       "SwigDirector_BaseElement_Serialize", "(Lio/adaptivecards/objectmodel/BaseElement;)Ljava/lang/String;" 
@@ -29170,10 +28831,10 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
       "SwigDirector_BaseElement_GetResourceInformation", "(Lio/adaptivecards/objectmodel/BaseElement;J)V" 
     },
     {
-      "SwigDirector_BaseCardElement_GetId", "(Lio/adaptivecards/objectmodel/BaseCardElement;)Ljava/lang/String;" 
+      "SwigDirector_BaseCardElement_SetId__SWIG_0", "(Lio/adaptivecards/objectmodel/BaseCardElement;J)V" 
     },
     {
-      "SwigDirector_BaseCardElement_SetId", "(Lio/adaptivecards/objectmodel/BaseCardElement;Ljava/lang/String;)V" 
+      "SwigDirector_BaseCardElement_SetId__SWIG_1", "(Lio/adaptivecards/objectmodel/BaseCardElement;Ljava/lang/String;)V" 
     },
     {
       "SwigDirector_BaseCardElement_Serialize", "(Lio/adaptivecards/objectmodel/BaseCardElement;)Ljava/lang/String;" 
@@ -29197,19 +28858,10 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
       "SwigDirector_BaseCardElement_SetSpacing", "(Lio/adaptivecards/objectmodel/BaseCardElement;I)V" 
     },
     {
-      "SwigDirector_BaseCardElement_GetIsVisible", "(Lio/adaptivecards/objectmodel/BaseCardElement;)Z" 
+      "SwigDirector_BaseActionElement_SetId__SWIG_0", "(Lio/adaptivecards/objectmodel/BaseActionElement;J)V" 
     },
     {
-      "SwigDirector_BaseCardElement_SetIsVisible", "(Lio/adaptivecards/objectmodel/BaseCardElement;Z)V" 
-    },
-    {
-      "SwigDirector_BaseCardElement_GetElementType", "(Lio/adaptivecards/objectmodel/BaseCardElement;)I" 
-    },
-    {
-      "SwigDirector_BaseActionElement_GetId", "(Lio/adaptivecards/objectmodel/BaseActionElement;)Ljava/lang/String;" 
-    },
-    {
-      "SwigDirector_BaseActionElement_SetId", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
+      "SwigDirector_BaseActionElement_SetId__SWIG_1", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
     },
     {
       "SwigDirector_BaseActionElement_Serialize", "(Lio/adaptivecards/objectmodel/BaseActionElement;)Ljava/lang/String;" 
@@ -29221,25 +28873,10 @@ SWIGEXPORT void JNICALL Java_io_adaptivecards_objectmodel_AdaptiveCardObjectMode
       "SwigDirector_BaseActionElement_GetResourceInformation", "(Lio/adaptivecards/objectmodel/BaseActionElement;J)V" 
     },
     {
-      "SwigDirector_BaseActionElement_GetTitle", "(Lio/adaptivecards/objectmodel/BaseActionElement;)Ljava/lang/String;" 
-    },
-    {
-      "SwigDirector_BaseActionElement_SetTitle", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
-    },
-    {
-      "SwigDirector_BaseActionElement_GetIconUrl", "(Lio/adaptivecards/objectmodel/BaseActionElement;)Ljava/lang/String;" 
-    },
-    {
-      "SwigDirector_BaseActionElement_SetIconUrl", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
-    },
-    {
-      "SwigDirector_BaseActionElement_GetStyle", "(Lio/adaptivecards/objectmodel/BaseActionElement;)Ljava/lang/String;" 
-    },
-    {
-      "SwigDirector_BaseActionElement_SetStyle", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
+      "SwigDirector_BaseActionElement_SetTitle__SWIG_0", "(Lio/adaptivecards/objectmodel/BaseActionElement;J)V" 
     },
     {
-      "SwigDirector_BaseActionElement_GetElementType", "(Lio/adaptivecards/objectmodel/BaseActionElement;)I" 
+      "SwigDirector_BaseActionElement_SetTitle__SWIG_1", "(Lio/adaptivecards/objectmodel/BaseActionElement;Ljava/lang/String;)V" 
     },
     {
       "SwigDirector_ActionElementParser_Deserialize", "(Lio/adaptivecards/objectmodel/ActionElementParser;JJ)J" 
diff --git a/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.h b/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.h
index 9b5441ca7d..9a5ae49914 100644
--- a/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.h
+++ b/source/android/adaptivecards/src/main/cpp/objectmodel_wrap.h
@@ -19,7 +19,7 @@ class SwigDirector_BaseElement : public AdaptiveCards::BaseElement, public Swig:
     SwigDirector_BaseElement(JNIEnv *jenv, AdaptiveCards::BaseElement const &arg0);
     SwigDirector_BaseElement(JNIEnv *jenv, AdaptiveCards::BaseElement &&arg0);
     virtual ~SwigDirector_BaseElement();
-    virtual std::string GetId() const;
+    virtual void SetId(std::string &&value);
     virtual void SetId(std::string const &value);
     virtual std::string Serialize() const;
     virtual Json::Value SerializeToJsonValue() const;
@@ -42,24 +42,21 @@ class SwigDirector_BaseCardElement : public AdaptiveCards::BaseCardElement, publ
     SwigDirector_BaseCardElement(JNIEnv *jenv, AdaptiveCards::BaseCardElement const &arg0);
     SwigDirector_BaseCardElement(JNIEnv *jenv, AdaptiveCards::BaseCardElement &&arg0);
     virtual ~SwigDirector_BaseCardElement();
-    virtual std::string GetId() const;
+    virtual void SetId(std::string &&value);
     virtual void SetId(std::string const &value);
     virtual std::string Serialize() const;
     virtual Json::Value SerializeToJsonValue() const;
     virtual void GetResourceInformation(std::vector< AdaptiveCards::RemoteResourceInformation > &resourceUris);
     virtual bool GetSeparator() const;
-    virtual void SetSeparator(bool const value);
+    virtual void SetSeparator(bool value);
     virtual AdaptiveCards::Spacing GetSpacing() const;
-    virtual void SetSpacing(AdaptiveCards::Spacing const value);
-    virtual bool GetIsVisible() const;
-    virtual void SetIsVisible(bool const value);
-    virtual AdaptiveCards::CardElementType GetElementType() const;
+    virtual void SetSpacing(AdaptiveCards::Spacing value);
 public:
     bool swig_overrides(int n) {
-      return (n < 12 ? swig_override[n] : false);
+      return (n < 9 ? swig_override[n] : false);
     }
 protected:
-    Swig::BoolArray<12> swig_override;
+    Swig::BoolArray<9> swig_override;
 };
 
 class SwigDirector_BaseActionElement : public AdaptiveCards::BaseActionElement, public Swig::Director {
@@ -71,24 +68,19 @@ class SwigDirector_BaseActionElement : public AdaptiveCards::BaseActionElement,
     SwigDirector_BaseActionElement(JNIEnv *jenv, AdaptiveCards::BaseActionElement const &arg0);
     SwigDirector_BaseActionElement(JNIEnv *jenv, AdaptiveCards::BaseActionElement &&arg0);
     virtual ~SwigDirector_BaseActionElement();
-    virtual std::string GetId() const;
+    virtual void SetId(std::string &&value);
     virtual void SetId(std::string const &value);
     virtual std::string Serialize() const;
     virtual Json::Value SerializeToJsonValue() const;
     virtual void GetResourceInformation(std::vector< AdaptiveCards::RemoteResourceInformation > &resourceUris);
-    virtual std::string GetTitle() const;
+    virtual void SetTitle(std::string &&value);
     virtual void SetTitle(std::string const &value);
-    virtual std::string GetIconUrl() const;
-    virtual void SetIconUrl(std::string const &value);
-    virtual std::string GetStyle() const;
-    virtual void SetStyle(std::string const &value);
-    virtual AdaptiveCards::ActionType GetElementType() const;
 public:
     bool swig_overrides(int n) {
-      return (n < 12 ? swig_override[n] : false);
+      return (n < 7 ? swig_override[n] : false);
     }
 protected:
-    Swig::BoolArray<12> swig_override;
+    Swig::BoolArray<7> swig_override;
 };
 
 class SwigDirector_ActionElementParser : public AdaptiveCards::ActionElementParser, public Swig::Director {
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/AdaptiveCardObjectModelJNI.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/AdaptiveCardObjectModelJNI.java
index 97d06b09f6..2a7b3f1efc 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/AdaptiveCardObjectModelJNI.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/AdaptiveCardObjectModelJNI.java
@@ -357,11 +357,13 @@ public class AdaptiveCardObjectModelJNI {
   public final static native long new_BaseElement__SWIG_1(long jarg1, BaseElement jarg1_);
   public final static native void delete_BaseElement(long jarg1);
   public final static native String BaseElement_GetElementTypeString(long jarg1, BaseElement jarg1_);
-  public final static native void BaseElement_SetElementTypeString(long jarg1, BaseElement jarg1_, String jarg2);
+  public final static native void BaseElement_SetElementTypeString__SWIG_0(long jarg1, BaseElement jarg1_, long jarg2);
+  public final static native void BaseElement_SetElementTypeString__SWIG_1(long jarg1, BaseElement jarg1_, String jarg2);
   public final static native String BaseElement_GetId(long jarg1, BaseElement jarg1_);
-  public final static native String BaseElement_GetIdSwigExplicitBaseElement(long jarg1, BaseElement jarg1_);
-  public final static native void BaseElement_SetId(long jarg1, BaseElement jarg1_, String jarg2);
-  public final static native void BaseElement_SetIdSwigExplicitBaseElement(long jarg1, BaseElement jarg1_, String jarg2);
+  public final static native void BaseElement_SetId__SWIG_0(long jarg1, BaseElement jarg1_, long jarg2);
+  public final static native void BaseElement_SetIdSwigExplicitBaseElement__SWIG_0(long jarg1, BaseElement jarg1_, long jarg2);
+  public final static native void BaseElement_SetId__SWIG_1(long jarg1, BaseElement jarg1_, String jarg2);
+  public final static native void BaseElement_SetIdSwigExplicitBaseElement__SWIG_1(long jarg1, BaseElement jarg1_, String jarg2);
   public final static native long BaseElement_GetInternalId(long jarg1, BaseElement jarg1_);
   public final static native String BaseElement_Serialize(long jarg1, BaseElement jarg1_);
   public final static native String BaseElement_SerializeSwigExplicitBaseElement(long jarg1, BaseElement jarg1_);
@@ -399,11 +401,8 @@ public class AdaptiveCardObjectModelJNI {
   public final static native void BaseCardElement_SetSpacing(long jarg1, BaseCardElement jarg1_, int jarg2);
   public final static native void BaseCardElement_SetSpacingSwigExplicitBaseCardElement(long jarg1, BaseCardElement jarg1_, int jarg2);
   public final static native boolean BaseCardElement_GetIsVisible(long jarg1, BaseCardElement jarg1_);
-  public final static native boolean BaseCardElement_GetIsVisibleSwigExplicitBaseCardElement(long jarg1, BaseCardElement jarg1_);
   public final static native void BaseCardElement_SetIsVisible(long jarg1, BaseCardElement jarg1_, boolean jarg2);
-  public final static native void BaseCardElement_SetIsVisibleSwigExplicitBaseCardElement(long jarg1, BaseCardElement jarg1_, boolean jarg2);
   public final static native int BaseCardElement_GetElementType(long jarg1, BaseCardElement jarg1_);
-  public final static native int BaseCardElement_GetElementTypeSwigExplicitBaseCardElement(long jarg1, BaseCardElement jarg1_);
   public final static native void BaseCardElement_ParseJsonObject(long jarg1, ParseContext jarg1_, long jarg2, JsonValue jarg2_, long jarg3, BaseElement jarg3_);
   public final static native java.lang.Object BaseCardElement_swigOriginalObject(long jarg1, BaseCardElement jarg1_);
   public final static native long BaseCardElement_dynamic_cast(long jarg1, BaseElement jarg1_);
@@ -414,19 +413,17 @@ public class AdaptiveCardObjectModelJNI {
   public final static native long new_BaseActionElement__SWIG_2(long jarg1, BaseActionElement jarg1_);
   public final static native void delete_BaseActionElement(long jarg1);
   public final static native String BaseActionElement_GetTitle(long jarg1, BaseActionElement jarg1_);
-  public final static native String BaseActionElement_GetTitleSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_);
-  public final static native void BaseActionElement_SetTitle(long jarg1, BaseActionElement jarg1_, String jarg2);
-  public final static native void BaseActionElement_SetTitleSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_, String jarg2);
+  public final static native void BaseActionElement_SetTitle__SWIG_0(long jarg1, BaseActionElement jarg1_, long jarg2);
+  public final static native void BaseActionElement_SetTitleSwigExplicitBaseActionElement__SWIG_0(long jarg1, BaseActionElement jarg1_, long jarg2);
+  public final static native void BaseActionElement_SetTitle__SWIG_1(long jarg1, BaseActionElement jarg1_, String jarg2);
+  public final static native void BaseActionElement_SetTitleSwigExplicitBaseActionElement__SWIG_1(long jarg1, BaseActionElement jarg1_, String jarg2);
   public final static native String BaseActionElement_GetIconUrl(long jarg1, BaseActionElement jarg1_);
-  public final static native String BaseActionElement_GetIconUrlSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_);
-  public final static native void BaseActionElement_SetIconUrl(long jarg1, BaseActionElement jarg1_, String jarg2);
-  public final static native void BaseActionElement_SetIconUrlSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_, String jarg2);
+  public final static native void BaseActionElement_SetIconUrl__SWIG_0(long jarg1, BaseActionElement jarg1_, long jarg2);
+  public final static native void BaseActionElement_SetIconUrl__SWIG_1(long jarg1, BaseActionElement jarg1_, String jarg2);
   public final static native String BaseActionElement_GetStyle(long jarg1, BaseActionElement jarg1_);
-  public final static native String BaseActionElement_GetStyleSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_);
-  public final static native void BaseActionElement_SetStyle(long jarg1, BaseActionElement jarg1_, String jarg2);
-  public final static native void BaseActionElement_SetStyleSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_, String jarg2);
+  public final static native void BaseActionElement_SetStyle__SWIG_0(long jarg1, BaseActionElement jarg1_, long jarg2);
+  public final static native void BaseActionElement_SetStyle__SWIG_1(long jarg1, BaseActionElement jarg1_, String jarg2);
   public final static native int BaseActionElement_GetElementType(long jarg1, BaseActionElement jarg1_);
-  public final static native int BaseActionElement_GetElementTypeSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_);
   public final static native void BaseActionElement_GetResourceInformation(long jarg1, BaseActionElement jarg1_, long jarg2, RemoteResourceInformationVector jarg2_);
   public final static native void BaseActionElement_GetResourceInformationSwigExplicitBaseActionElement(long jarg1, BaseActionElement jarg1_, long jarg2, RemoteResourceInformationVector jarg2_);
   public final static native long BaseActionElement_SerializeToJsonValue(long jarg1, BaseActionElement jarg1_);
@@ -1452,10 +1449,10 @@ public class AdaptiveCardObjectModelJNI {
   public final static native long TextRun_SWIGSmartPtrUpcast(long jarg1);
   public final static native long RichTextElementProperties_SWIGSmartPtrUpcast(long jarg1);
 
-  public static String SwigDirector_BaseElement_GetId(BaseElement jself) {
-    return jself.GetId();
+  public static void SwigDirector_BaseElement_SetId__SWIG_0(BaseElement jself, long value) {
+    jself.SetId(new SWIGTYPE_p_std__string(value, false));
   }
-  public static void SwigDirector_BaseElement_SetId(BaseElement jself, String value) {
+  public static void SwigDirector_BaseElement_SetId__SWIG_1(BaseElement jself, String value) {
     jself.SetId(value);
   }
   public static String SwigDirector_BaseElement_Serialize(BaseElement jself) {
@@ -1467,10 +1464,10 @@ public static long SwigDirector_BaseElement_SerializeToJsonValue(BaseElement jse
   public static void SwigDirector_BaseElement_GetResourceInformation(BaseElement jself, long resourceUris) {
     jself.GetResourceInformation(new RemoteResourceInformationVector(resourceUris, false));
   }
-  public static String SwigDirector_BaseCardElement_GetId(BaseCardElement jself) {
-    return jself.GetId();
+  public static void SwigDirector_BaseCardElement_SetId__SWIG_0(BaseCardElement jself, long value) {
+    jself.SetId(new SWIGTYPE_p_std__string(value, false));
   }
-  public static void SwigDirector_BaseCardElement_SetId(BaseCardElement jself, String value) {
+  public static void SwigDirector_BaseCardElement_SetId__SWIG_1(BaseCardElement jself, String value) {
     jself.SetId(value);
   }
   public static String SwigDirector_BaseCardElement_Serialize(BaseCardElement jself) {
@@ -1494,19 +1491,10 @@ public static int SwigDirector_BaseCardElement_GetSpacing(BaseCardElement jself)
   public static void SwigDirector_BaseCardElement_SetSpacing(BaseCardElement jself, int value) {
     jself.SetSpacing(Spacing.swigToEnum(value));
   }
-  public static boolean SwigDirector_BaseCardElement_GetIsVisible(BaseCardElement jself) {
-    return jself.GetIsVisible();
+  public static void SwigDirector_BaseActionElement_SetId__SWIG_0(BaseActionElement jself, long value) {
+    jself.SetId(new SWIGTYPE_p_std__string(value, false));
   }
-  public static void SwigDirector_BaseCardElement_SetIsVisible(BaseCardElement jself, boolean value) {
-    jself.SetIsVisible(value);
-  }
-  public static int SwigDirector_BaseCardElement_GetElementType(BaseCardElement jself) {
-    return (jself.GetElementType()).swigValue();
-  }
-  public static String SwigDirector_BaseActionElement_GetId(BaseActionElement jself) {
-    return jself.GetId();
-  }
-  public static void SwigDirector_BaseActionElement_SetId(BaseActionElement jself, String value) {
+  public static void SwigDirector_BaseActionElement_SetId__SWIG_1(BaseActionElement jself, String value) {
     jself.SetId(value);
   }
   public static String SwigDirector_BaseActionElement_Serialize(BaseActionElement jself) {
@@ -1518,27 +1506,12 @@ public static long SwigDirector_BaseActionElement_SerializeToJsonValue(BaseActio
   public static void SwigDirector_BaseActionElement_GetResourceInformation(BaseActionElement jself, long resourceUris) {
     jself.GetResourceInformation(new RemoteResourceInformationVector(resourceUris, false));
   }
-  public static String SwigDirector_BaseActionElement_GetTitle(BaseActionElement jself) {
-    return jself.GetTitle();
+  public static void SwigDirector_BaseActionElement_SetTitle__SWIG_0(BaseActionElement jself, long value) {
+    jself.SetTitle(new SWIGTYPE_p_std__string(value, false));
   }
-  public static void SwigDirector_BaseActionElement_SetTitle(BaseActionElement jself, String value) {
+  public static void SwigDirector_BaseActionElement_SetTitle__SWIG_1(BaseActionElement jself, String value) {
     jself.SetTitle(value);
   }
-  public static String SwigDirector_BaseActionElement_GetIconUrl(BaseActionElement jself) {
-    return jself.GetIconUrl();
-  }
-  public static void SwigDirector_BaseActionElement_SetIconUrl(BaseActionElement jself, String value) {
-    jself.SetIconUrl(value);
-  }
-  public static String SwigDirector_BaseActionElement_GetStyle(BaseActionElement jself) {
-    return jself.GetStyle();
-  }
-  public static void SwigDirector_BaseActionElement_SetStyle(BaseActionElement jself, String value) {
-    jself.SetStyle(value);
-  }
-  public static int SwigDirector_BaseActionElement_GetElementType(BaseActionElement jself) {
-    return (jself.GetElementType()).swigValue();
-  }
   public static long SwigDirector_ActionElementParser_Deserialize(ActionElementParser jself, long context, long value) {
     return BaseActionElement.getCPtr(jself.Deserialize((context == 0) ? null : new ParseContext(context, true), new JsonValue(value, false)));
   }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseActionElement.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseActionElement.java
index a5a3d4e604..7c10036f0d 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseActionElement.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseActionElement.java
@@ -80,31 +80,43 @@ public BaseActionElement(BaseActionElement arg0) {
   }
 
   public String GetTitle() {
-    return (getClass() == BaseActionElement.class) ? AdaptiveCardObjectModelJNI.BaseActionElement_GetTitle(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseActionElement_GetTitleSwigExplicitBaseActionElement(swigCPtr, this);
+    return AdaptiveCardObjectModelJNI.BaseActionElement_GetTitle(swigCPtr, this);
+  }
+
+  public void SetTitle(SWIGTYPE_p_std__string value) {
+    if (getClass() == BaseActionElement.class) AdaptiveCardObjectModelJNI.BaseActionElement_SetTitle__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value)); else AdaptiveCardObjectModelJNI.BaseActionElement_SetTitleSwigExplicitBaseActionElement__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value));
   }
 
   public void SetTitle(String value) {
-    if (getClass() == BaseActionElement.class) AdaptiveCardObjectModelJNI.BaseActionElement_SetTitle(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseActionElement_SetTitleSwigExplicitBaseActionElement(swigCPtr, this, value);
+    if (getClass() == BaseActionElement.class) AdaptiveCardObjectModelJNI.BaseActionElement_SetTitle__SWIG_1(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseActionElement_SetTitleSwigExplicitBaseActionElement__SWIG_1(swigCPtr, this, value);
   }
 
   public String GetIconUrl() {
-    return (getClass() == BaseActionElement.class) ? AdaptiveCardObjectModelJNI.BaseActionElement_GetIconUrl(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseActionElement_GetIconUrlSwigExplicitBaseActionElement(swigCPtr, this);
+    return AdaptiveCardObjectModelJNI.BaseActionElement_GetIconUrl(swigCPtr, this);
+  }
+
+  public void SetIconUrl(SWIGTYPE_p_std__string value) {
+    AdaptiveCardObjectModelJNI.BaseActionElement_SetIconUrl__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value));
   }
 
   public void SetIconUrl(String value) {
-    if (getClass() == BaseActionElement.class) AdaptiveCardObjectModelJNI.BaseActionElement_SetIconUrl(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseActionElement_SetIconUrlSwigExplicitBaseActionElement(swigCPtr, this, value);
+    AdaptiveCardObjectModelJNI.BaseActionElement_SetIconUrl__SWIG_1(swigCPtr, this, value);
   }
 
   public String GetStyle() {
-    return (getClass() == BaseActionElement.class) ? AdaptiveCardObjectModelJNI.BaseActionElement_GetStyle(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseActionElement_GetStyleSwigExplicitBaseActionElement(swigCPtr, this);
+    return AdaptiveCardObjectModelJNI.BaseActionElement_GetStyle(swigCPtr, this);
+  }
+
+  public void SetStyle(SWIGTYPE_p_std__string value) {
+    AdaptiveCardObjectModelJNI.BaseActionElement_SetStyle__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value));
   }
 
   public void SetStyle(String value) {
-    if (getClass() == BaseActionElement.class) AdaptiveCardObjectModelJNI.BaseActionElement_SetStyle(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseActionElement_SetStyleSwigExplicitBaseActionElement(swigCPtr, this, value);
+    AdaptiveCardObjectModelJNI.BaseActionElement_SetStyle__SWIG_1(swigCPtr, this, value);
   }
 
   public ActionType GetElementType() {
-    return ActionType.swigToEnum((getClass() == BaseActionElement.class) ? AdaptiveCardObjectModelJNI.BaseActionElement_GetElementType(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseActionElement_GetElementTypeSwigExplicitBaseActionElement(swigCPtr, this));
+    return ActionType.swigToEnum(AdaptiveCardObjectModelJNI.BaseActionElement_GetElementType(swigCPtr, this));
   }
 
   public void GetResourceInformation(RemoteResourceInformationVector resourceUris) {
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseCardElement.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseCardElement.java
index 78878bfb11..f462a147b0 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseCardElement.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseCardElement.java
@@ -113,15 +113,15 @@ public void SetSpacing(Spacing value) {
   }
 
   public boolean GetIsVisible() {
-    return (getClass() == BaseCardElement.class) ? AdaptiveCardObjectModelJNI.BaseCardElement_GetIsVisible(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseCardElement_GetIsVisibleSwigExplicitBaseCardElement(swigCPtr, this);
+    return AdaptiveCardObjectModelJNI.BaseCardElement_GetIsVisible(swigCPtr, this);
   }
 
   public void SetIsVisible(boolean value) {
-    if (getClass() == BaseCardElement.class) AdaptiveCardObjectModelJNI.BaseCardElement_SetIsVisible(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseCardElement_SetIsVisibleSwigExplicitBaseCardElement(swigCPtr, this, value);
+    AdaptiveCardObjectModelJNI.BaseCardElement_SetIsVisible(swigCPtr, this, value);
   }
 
   public CardElementType GetElementType() {
-    return CardElementType.swigToEnum((getClass() == BaseCardElement.class) ? AdaptiveCardObjectModelJNI.BaseCardElement_GetElementType(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseCardElement_GetElementTypeSwigExplicitBaseCardElement(swigCPtr, this));
+    return CardElementType.swigToEnum(AdaptiveCardObjectModelJNI.BaseCardElement_GetElementType(swigCPtr, this));
   }
 
   public static void ParseJsonObject(ParseContext context, JsonValue json, BaseElement element) {
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseElement.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseElement.java
index 49f7a3b4e5..9327c23670 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseElement.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/BaseElement.java
@@ -69,16 +69,24 @@ public String GetElementTypeString() {
     return AdaptiveCardObjectModelJNI.BaseElement_GetElementTypeString(swigCPtr, this);
   }
 
+  public void SetElementTypeString(SWIGTYPE_p_std__string value) {
+    AdaptiveCardObjectModelJNI.BaseElement_SetElementTypeString__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value));
+  }
+
   public void SetElementTypeString(String value) {
-    AdaptiveCardObjectModelJNI.BaseElement_SetElementTypeString(swigCPtr, this, value);
+    AdaptiveCardObjectModelJNI.BaseElement_SetElementTypeString__SWIG_1(swigCPtr, this, value);
   }
 
   public String GetId() {
-    return (getClass() == BaseElement.class) ? AdaptiveCardObjectModelJNI.BaseElement_GetId(swigCPtr, this) : AdaptiveCardObjectModelJNI.BaseElement_GetIdSwigExplicitBaseElement(swigCPtr, this);
+    return AdaptiveCardObjectModelJNI.BaseElement_GetId(swigCPtr, this);
+  }
+
+  public void SetId(SWIGTYPE_p_std__string value) {
+    if (getClass() == BaseElement.class) AdaptiveCardObjectModelJNI.BaseElement_SetId__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value)); else AdaptiveCardObjectModelJNI.BaseElement_SetIdSwigExplicitBaseElement__SWIG_0(swigCPtr, this, SWIGTYPE_p_std__string.getCPtr(value));
   }
 
   public void SetId(String value) {
-    if (getClass() == BaseElement.class) AdaptiveCardObjectModelJNI.BaseElement_SetId(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseElement_SetIdSwigExplicitBaseElement(swigCPtr, this, value);
+    if (getClass() == BaseElement.class) AdaptiveCardObjectModelJNI.BaseElement_SetId__SWIG_1(swigCPtr, this, value); else AdaptiveCardObjectModelJNI.BaseElement_SetIdSwigExplicitBaseElement__SWIG_1(swigCPtr, this, value);
   }
 
   public InternalId GetInternalId() {
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__string.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__string.java
new file mode 100644
index 0000000000..8ae4937a89
--- /dev/null
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__string.java
@@ -0,0 +1,26 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.1
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package io.adaptivecards.objectmodel;
+
+public class SWIGTYPE_p_std__string {
+  private transient long swigCPtr;
+
+  protected SWIGTYPE_p_std__string(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_std__string() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_std__string obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t.java
new file mode 100644
index 0000000000..b36fd68c7d
--- /dev/null
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t.java
@@ -0,0 +1,26 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.1
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package io.adaptivecards.objectmodel;
+
+public class SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t {
+  private transient long swigCPtr;
+
+  protected SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_std__unordered_mapT_std__string_AdaptiveCards__SemanticVersion_t obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java
index fa340c1127..10dc4026e1 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java
@@ -8,6 +8,7 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -65,6 +66,39 @@ public static ChoiceSetInputRenderer getInstance()
         return s_instance;
     }
 
+    public static class FocusableChoiceListener<T extends CompoundButton> implements View.OnTouchListener
+    {
+        public FocusableChoiceListener(T firstView)
+        {
+            m_firstView = firstView;
+        }
+
+        @Override
+        public boolean onTouch(View view, MotionEvent motionEvent)
+        {
+            if (motionEvent.getAction() == MotionEvent.ACTION_UP)
+            {
+                m_firstView.setFocusableInTouchMode(false);
+                m_firstView.clearFocus();
+
+                T clickableElement = (T) view;
+                // Checkboxes must change their values to the opposite one, radio buttons must always turn on
+                if (clickableElement instanceof CheckBox)
+                {
+                    clickableElement.setChecked(!clickableElement.isChecked());
+                }
+                else
+                {
+                    clickableElement.setChecked(true);
+                }
+
+            }
+            return true;
+        }
+
+        private T m_firstView;
+    }
+
     public View renderCheckBoxSet(
                 RenderedAdaptiveCard renderedCard,
                 Context context,
@@ -90,7 +124,7 @@ public View renderCheckBoxSet(
         for (int i = 0; i < size; i++)
         {
             ChoiceInput choiceInput = choiceInputVector.get(i);
-            CheckBox checkBox = new CheckBox(context);
+            final CheckBox checkBox = new CheckBox(context);
             checkBox.setText(choiceInput.GetTitle());
 
             if (!choiceSetInput.GetWrap())
@@ -112,6 +146,13 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
                     CardRendererRegistration.getInstance().notifyInputChange(checkBoxSetInputHandler.getId(), checkBoxSetInputHandler.getInput());
                 }
             });
+
+            // Only for the first checkbox we'll add some extra behaviour as it's going to be the element to receive focus
+            // When validation fails we'll set the first checkbox with focusableInTouchMode = true, this makes the clicking
+            // inconsistent as it needs two clicks to check/uncheck, so once it's clicked, we'll remove the property to false
+            // and check/uncheck the box ourselves
+            checkBox.setOnTouchListener(new FocusableChoiceListener<CheckBox>(checkBoxList.get(0)));
+
             layout.addView(checkBox);
         }
 
@@ -135,6 +176,7 @@ public View renderRadioGroup(
         ChoiceInputVector choiceInputVector = choiceSetInput.GetChoices();
         long size = choiceInputVector.size();
         String value = choiceSetInput.GetValue();
+
         for (int i = 0; i < size; i++)
         {
             ChoiceInput choiceInput = choiceInputVector.get(i);
@@ -152,7 +194,10 @@ public View renderRadioGroup(
             {
                 radioButton.setChecked(true);
             }
+
             radioGroup.addView(radioButton);
+
+            radioButton.setOnTouchListener(new FocusableChoiceListener<RadioButton>((RadioButton) radioGroup.getChildAt(0)));
         }
         renderedCard.registerInputHandler(radioGroupInputHandler, renderArgs.getContainerCardId());
         radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener()
@@ -163,6 +208,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId)
                 CardRendererRegistration.getInstance().notifyInputChange(radioGroupInputHandler.getId(), radioGroupInputHandler.getInput());
             }
         });
+
         return radioGroup;
     }
 
@@ -280,6 +326,8 @@ public void onNothingSelected(AdapterView<?> parent)
                 CardRendererRegistration.getInstance().notifyInputChange(comboBoxInputHandler.getId(), comboBoxInputHandler.getInput());
             }
         });
+
+        spinner.setFocusable(true);
         return spinner;
     }
 
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/TextInputRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/TextInputRenderer.java
index 45ca0bcba5..1c3e5155ac 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/TextInputRenderer.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/TextInputRenderer.java
@@ -204,6 +204,7 @@ protected EditText renderInternal(
             // editText.addTextChangedListener(new UnvalidatedTextWatcher(textInputHandler));
         }
 
+        editText.setFocusable(true);
         textInputHandler.setView(editText);
         renderedCard.registerInputHandler(textInputHandler, renderArgs.getContainerCardId());
 
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ToggleInputRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ToggleInputRenderer.java
index 6da0201947..2ebbdfb63c 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ToggleInputRenderer.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ToggleInputRenderer.java
@@ -6,6 +6,7 @@
 import android.nfc.Tag;
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
@@ -73,6 +74,7 @@ public View render(
             checkBox.setLines(1);
             checkBox.setEllipsize(TextUtils.TruncateAt.END);
         }
+
         toggleInputHandler.setView(checkBox);
 
         TagContent tagContent = new TagContent(toggleInput, toggleInputHandler);
@@ -94,6 +96,9 @@ public View render(
         {
             checkBox.setChecked(true);
         }
+
+        checkBox.setOnTouchListener(new ChoiceSetInputRenderer.FocusableChoiceListener<CheckBox>(checkBox));
+
         checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
         {
             @Override
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/BaseInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/BaseInputHandler.java
index e88f5ee4e8..16a1091334 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/BaseInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/BaseInputHandler.java
@@ -93,11 +93,6 @@ public void showValidationErrors(boolean isValid)
         }
     }
 
-    public void setFocusToView()
-    {
-        m_view.requestFocus();
-    }
-
     protected BaseInputElement m_baseInputElement = null;
     protected View m_view = null;
     private StretchableInputLayout m_inputLayout = null;
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/CheckBoxSetInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/CheckBoxSetInputHandler.java
index 1fb5d1dc4e..cade949001 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/CheckBoxSetInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/CheckBoxSetInputHandler.java
@@ -2,8 +2,10 @@
 // Licensed under the MIT License.
 package io.adaptivecards.renderer.inputhandler;
 
+import android.text.Layout;
 import android.text.TextUtils;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
 
 import io.adaptivecards.objectmodel.BaseInputElement;
 import io.adaptivecards.objectmodel.ChoiceInputVector;
@@ -71,5 +73,15 @@ public void setInput(String values)
         }
     }
 
+    @Override
+    public void setFocusToView()
+    {
+        if (m_checkBoxList.size() > 0)
+        {
+            m_checkBoxList.get(0).setFocusableInTouchMode(true);
+            m_checkBoxList.get(0).requestFocus();
+        }
+    }
+
     private List<CheckBox> m_checkBoxList;
 }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ComboBoxInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ComboBoxInputHandler.java
index 6b003ffbd5..dfcd157240 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ComboBoxInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ComboBoxInputHandler.java
@@ -55,4 +55,11 @@ public void setInput(String value)
 
         getSpinner().setSelection(selectedPosition);
     }
+
+    @Override
+    public void setFocusToView()
+    {
+        m_view.requestFocus();
+        m_view.performClick();
+    }
 }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/IInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/IInputHandler.java
index 993ea3f907..18fb8d28c6 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/IInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/IInputHandler.java
@@ -10,4 +10,5 @@ public interface IInputHandler
     void setInput(String input);
 
     boolean isValid();
+    void setFocusToView();
 }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/RadioGroupInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/RadioGroupInputHandler.java
index f1773ea237..e675735fbd 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/RadioGroupInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/RadioGroupInputHandler.java
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 package io.adaptivecards.renderer.inputhandler;
 
+import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
 import io.adaptivecards.objectmodel.BaseInputElement;
@@ -62,7 +63,6 @@ public void setInput(String choice)
                 }
             }
         }
-
         else
         {
             // Indicates no item was selected
@@ -70,4 +70,18 @@ public void setInput(String choice)
         }
     }
 
+    @Override
+    public void setFocusToView()
+    {
+        RadioGroup radioGroup = (RadioGroup)m_view;
+
+        if (radioGroup.getChildCount() > 0)
+        {
+            RadioButton radioButton = (RadioButton)(radioGroup.getChildAt(0));
+
+            radioButton.setFocusableInTouchMode(true);
+            radioButton.requestFocus();
+        }
+    }
+
 }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/TextInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/TextInputHandler.java
index aab36838e0..1ce568f6d1 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/TextInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/TextInputHandler.java
@@ -51,4 +51,8 @@ public boolean isValidOnSpecifics(String textInputValue)
         return isValid;
     }
 
+    public void setFocusToView()
+    {
+        m_view.requestFocus();
+    }
 }
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ToggleInputHandler.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ToggleInputHandler.java
index 0a090d6d3c..afc6be020b 100644
--- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ToggleInputHandler.java
+++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ToggleInputHandler.java
@@ -54,4 +54,11 @@ public boolean isValid()
 
         return isValid;
     }
+
+    @Override
+    public void setFocusToView()
+    {
+        m_view.setFocusableInTouchMode(true);
+        m_view.requestFocus();
+    }
 }
diff --git a/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/CustomObjects/CardElements/CustomInput.java b/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/CustomObjects/CardElements/CustomInput.java
new file mode 100644
index 0000000000..f117bce800
--- /dev/null
+++ b/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/CustomObjects/CardElements/CustomInput.java
@@ -0,0 +1,131 @@
+package io.adaptivecards.adaptivecardssample.CustomObjects.CardElements;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.support.v4.app.FragmentManager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import io.adaptivecards.objectmodel.BaseCardElement;
+import io.adaptivecards.objectmodel.BaseCardElementParser;
+import io.adaptivecards.objectmodel.BaseInputElement;
+import io.adaptivecards.objectmodel.CardElementType;
+import io.adaptivecards.objectmodel.HostConfig;
+import io.adaptivecards.objectmodel.JsonValue;
+import io.adaptivecards.objectmodel.ParseContext;
+import io.adaptivecards.renderer.BaseCardElementRenderer;
+import io.adaptivecards.renderer.RenderArgs;
+import io.adaptivecards.renderer.RenderedAdaptiveCard;
+import io.adaptivecards.renderer.TagContent;
+import io.adaptivecards.renderer.Util;
+import io.adaptivecards.renderer.actionhandler.ICardActionHandler;
+import io.adaptivecards.renderer.inputhandler.BaseInputHandler;
+import io.adaptivecards.renderer.inputhandler.IInputHandler;
+
+public class CustomInput extends BaseInputElement
+{
+    public CustomInput(CardElementType cardElementType)
+    {
+        super(cardElementType);
+    }
+
+    public static class CustomInputHandler extends BaseInputHandler
+    {
+        public CustomInputHandler(BaseInputElement baseInputElement, EditText editText)
+        {
+            super(baseInputElement);
+            m_view = editText;
+        }
+
+        @Override
+        public String getInput()
+        {
+            return ((EditText)m_view).getText().toString();
+        }
+
+        @Override
+        public void setInput(String input)
+        {
+            ((EditText)m_view).setText(input);
+        }
+
+        @Override
+        public void setFocusToView()
+        {
+            m_view.requestFocus();
+        }
+    }
+
+    public static class CustomInputRenderer extends BaseCardElementRenderer
+    {
+        @Override
+        public View render(RenderedAdaptiveCard renderedCard,
+                           Context context,
+                           FragmentManager fragmentManager,
+                           ViewGroup viewGroup,
+                           BaseCardElement baseCardElement,
+                           ICardActionHandler cardActionHandler,
+                           HostConfig hostConfig,
+                           RenderArgs renderArgs) throws Exception
+        {
+            EditText renderedInput = new EditText(context);
+            renderedInput.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+
+            renderedInput.setBackgroundColor(Color.GREEN);
+            renderedInput.setTag(new TagContent(baseCardElement));
+            viewGroup.addView(renderedInput);
+
+            BaseInputElement inputElement = Util.castTo(baseCardElement, BaseInputElement.class);
+            renderedCard.registerInputHandler(new CustomInputHandler(inputElement, renderedInput), renderArgs.getContainerCardId());
+            return renderedInput;
+        }
+    }
+
+
+    public static class CustomInputParser extends BaseCardElementParser
+    {
+        @Override
+        public BaseCardElement Deserialize(ParseContext context, JsonValue value)
+        {
+            CustomInput element = new CustomInput(CardElementType.Custom);
+            element.SetElementTypeString(customInputTypeString);
+            String val = value.getString();
+            try
+            {
+                JSONObject obj = new JSONObject(val);
+                element.SetId(obj.getString("id"));
+                element.SetLabel(obj.getString("label"));
+            }
+            catch (JSONException e)
+            {
+                e.printStackTrace();
+            }
+            return element;
+        }
+
+        @Override
+        public BaseCardElement DeserializeFromString(ParseContext context, String jsonString)
+        {
+            CustomInput element = new CustomInput(CardElementType.Custom);
+            element.SetElementTypeString(customInputTypeString);
+            try
+            {
+                JSONObject obj = new JSONObject(jsonString);
+                element.SetId(obj.getString("id"));
+                element.SetLabel(obj.getString("label"));
+            }
+            catch (JSONException e)
+            {
+                e.printStackTrace();
+            }
+            return element;
+        }
+    }
+
+    public final static String customInputTypeString = "customInput";
+}
diff --git a/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/MainActivityAdaptiveCardsSample.java b/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/MainActivityAdaptiveCardsSample.java
index c9f46b8834..d396242d58 100644
--- a/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/MainActivityAdaptiveCardsSample.java
+++ b/source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/MainActivityAdaptiveCardsSample.java
@@ -210,6 +210,7 @@ private ParseContext createParseContextForCustomElements()
         {
             elementParserRegistration = new ElementParserRegistration();
             elementParserRegistration.AddParser("blah", new CustomBlahParser());
+            elementParserRegistration.AddParser(CustomInput.customInputTypeString, new CustomInput.CustomInputParser());
 
             actionParserRegistration = new ActionParserRegistration();
             actionParserRegistration.AddParser(CustomRedActionElement.CustomActionId, new CustomRedActionParser());
@@ -293,6 +294,7 @@ private void registerCustomElementRenderers()
         if (m_customElements.isChecked())
         {
             CardRendererRegistration.getInstance().registerRenderer("blah", new CustomBlahRenderer());
+            CardRendererRegistration.getInstance().registerRenderer(CustomInput.customInputTypeString, new CustomInput.CustomInputRenderer());
         }
     }